Update for 2011.11

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
linux: update stable kernel to 3.1.4
2026-01-12 22:09:53 +03:00 · 2011-12-01 00:08:44 +01:00 · 2011-11-29 09:18:30 +01:00 · 2011-11-29 09:17:20 +01:00 · 2011-11-27 22:41:29 +01:00 · 2011-11-27 22:41:09 +01:00
31 changed files with 158 additions and 50 deletions
--- a/24
+++ b/24
@@ -1,3 +1,27 @@
+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.
+
+	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,
+	php, rsyslog, ruby, thttpd, xapp_xf86dga
+
+	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:

 	Fixes all over the tree and new features.
--- a/2
+++ b/2
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------

 # Set and export the version string
-export BR2_VERSION:=2011.11-rc2
+export BR2_VERSION:=2011.11

 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
--- 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

--- 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

--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -1031,7 +1031,7 @@ $(eval $(call GENTARGETS,package,libfoo,host))

      <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>
@@ -1787,9 +1787,9 @@ 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>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>

--- a/docs/download.html
+++ b/docs/download.html
@@ -6,22 +6,22 @@

 <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-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
 <a href="/downloads/">http://buildroot.net/downloads/</a>.

--- 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+
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,26 @@
 <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
+    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
--- 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.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.1"
+	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.1" 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
--- 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)
--- 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
--- 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
--- 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)" \
--- 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

--- 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
--- 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

--- 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
--- 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
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -10,9 +10,8 @@ RUBY_AUTORECONF = YES
 HOST_RUBY_AUTORECONF = YES
 RUBY_DEPENDENCIES = host-ruby
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
-RUBY_CONF_OPT = --disable-install-doc
-
-HOST_RUBY_CONF_OPT = --disable-install-doc
+RUBY_CONF_OPT = --disable-install-doc --disable-rpath
+HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline

 # Force optionals to build before we do
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
--- a/package/thttpd/thttpd-2.25b-getline.patch
+++ 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;
--- 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))
--- 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"
--- 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 )
--- 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
@@ -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
--- 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
--- 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.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
--- a/toolchain/kernel-headers/linux-3.0.12-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
--- 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

--- 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
--- 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

--- 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
Author	SHA1	Message	Date
Peter Korsgaard	c29253ef2e	Update for 2011.11 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-12-01 00:08:44 +01:00
Peter Korsgaard	47c46ea1fc	linux: update stable kernel to 3.1.4 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-29 09:18:30 +01:00
Peter Korsgaard	effecb4a01	kernel-headers: bump 3.0.x / 3.1.x stable versions Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-29 09:17:20 +01:00
Sven Neumann	c6932d2148	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>	2011-11-27 22:41:29 +01:00
Sven Neumann	c71833418e	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>	2011-11-27 22:41:09 +01:00
Peter Korsgaard	e4c61e5ea4	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>	2011-11-27 22:16:40 +01:00
Peter Korsgaard	4dc18dc514	Update for 2011.11-rc3 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-26 22:05:20 +01:00
Danomi Mocelopolis	ec02a34b0a	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>	2011-11-26 21:56:25 +01:00
Peter Korsgaard	6d985f97c8	CHANGES: update with recent changes Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-26 21:51:42 +01:00
Gustavo Zacarias	150124b952	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>	2011-11-26 14:30:15 +01:00
Gustavo Zacarias	fc11bb0ab4	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>	2011-11-26 14:30:11 +01:00
Gustavo Zacarias	30ed378a97	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>	2011-11-26 13:55:11 +01:00
Gustavo Zacarias	7948b0c621	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>	2011-11-26 13:07:14 +01:00
Damian Kaczmarek	9f930d2d7f	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>	2011-11-24 23:07:09 +01:00
Peter Korsgaard	0ff53f128d	CHANGES: update with recent changes Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-24 23:03:57 +01:00
Peter Korsgaard	1db649c6fe	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>	2011-11-24 22:29:46 +01:00
Peter Korsgaard	5931db0de9	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>	2011-11-24 14:26:52 +01:00
Peter Korsgaard	468f1cac8a	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>	2011-11-23 23:36:32 +01:00
Peter Korsgaard	e9985f5d5f	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>	2011-11-23 23:32:00 +01:00
Peter Korsgaard	1fccc20314	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>	2011-11-23 23:28:30 +01:00
Trevor Woerner	7a63f1a08c	docs: Fix assumed copy+paste error. Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-22 20:59:37 +01:00
Gustavo Zacarias	9fec836b7e	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>	2011-11-22 10:15:44 +01:00
Gustavo Zacarias	66bdd2a27b	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>	2011-11-22 10:15:29 +01:00
Gustavo Zacarias	f4642c8bae	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>	2011-11-22 10:15:09 +01:00
Trevor Woerner	a51194985a	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>	2011-11-21 23:17:52 +01:00
Yann E. MORIN	32bea4a1cf	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>	2011-11-20 21:54:45 +01:00
Peter Korsgaard	c83738b2a4	opencv: ffmpeg supports needs largefile / ipv6 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-19 22:40:33 +01:00
Peter Korsgaard	376a535fb3	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>	2011-11-19 19:56:50 +01:00
Peter Korsgaard	c29fad1e1b	mplayer: external tremor support needs ogg as well Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-19 15:56:48 +01:00
Peter Korsgaard	c94b24a851	xapp_xf86dga: fix dependencies Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2011-11-18 16:06:39 +01:00