Update for 2012.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
docs/docs.html: Point users to html asciidoc documentation
2026-01-11 14:10:13 +03:00 · 2012-05-30 23:23:07 +02:00 · 2012-05-30 22:39:13 +02:00 · 2012-05-29 10:05:04 +02:00 · 2012-05-28 09:25:17 +02:00 · 2012-05-27 21:10:42 +02:00
41 changed files with 121 additions and 117 deletions
--- a/17
+++ b/17
@@ -1,3 +1,20 @@
+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.
+
+	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.
--- a/2
+++ b/2
@@ -24,7 +24,7 @@
 #--------------------------------------------------------------

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

 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
--- 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
--- 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
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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"
--- 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"
--- 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>
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,22 +6,22 @@

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

--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,27 @@
 <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
+    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
--- 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
--- 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
--- 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
--- 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?"
--- 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,11 +0,0 @@
--- 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
- 
--- 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
@@ -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);
- 		}
- 	}
- 
--- 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
@@ -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;
--- 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
@@ -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;
- 
--- 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
--- 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
--- a/package/gpsd/gpsd-2.95-navcom.patch
+++ b/package/gpsd/gpsd-2.95-navcom.patch
--- 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.
--- a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
+++ b/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
--- 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##*/} ; \
--- 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")
--- 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
--- 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
--- 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 ; \
--- 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= \
--- 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
--- 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-.}
--- 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.17"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.6"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.18"	if BR2_KERNEL_HEADERS_3_2
+	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
--- a/toolchain/kernel-headers/linux-3.0.32-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
--- a/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
+++ b/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
Author	SHA1	Message	Date
Peter Korsgaard	bce34ab199	Update for 2012.05 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-30 23:23:07 +02:00
Peter Korsgaard	3729718350	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>	2012-05-30 22:39:13 +02:00
Peter Korsgaard	ffc4afe084	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>	2012-05-29 10:05:04 +02:00
Peter Korsgaard	8a1e83823d	busybox: bump 1.20.x version Bugfix release. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-28 09:25:17 +02:00
Peter Korsgaard	7643670052	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>	2012-05-27 21:10:42 +02:00
Peter Korsgaard	0b0d7badb0	Update for 2012.05-rc3 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-25 21:09:50 +02:00
Peter Korsgaard	573a740998	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>	2012-05-25 21:02:55 +02:00
Thomas De Schampheleire	3ae7d81407	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>	2012-05-23 21:49:40 +02:00
Gustavo Zacarias	a3c46e4f17	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>	2012-05-23 13:42:17 +02:00
Gustavo Zacarias	4f0bc3b74f	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>	2012-05-22 21:26:16 +02:00
Gustavo Zacarias	82609df4dd	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>	2012-05-22 21:26:13 +02:00
Gustavo Zacarias	66c7e29451	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>	2012-05-22 21:26:08 +02:00
Peter Korsgaard	ae446b2ea3	bison: m4 needs MMU Fixes http://autobuild.buildroot.net/results/0bb659881ed6a01745f596f00da9acbef02a4c31/ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-22 15:26:27 +02:00
Peter Korsgaard	c73df193c5	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>	2012-05-22 10:11:47 +02:00
Peter Korsgaard	602de0675e	ntfs-3g: fix build with encryption support Fixes http://autobuild.buildroot.org/results/4baa45ca1f4804be1a76a69bb8158c6a91d96d6b/ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-22 09:39:34 +02:00
Peter Korsgaard	1c52c9e1fb	gnuchess: needs threads Fixes http://autobuild.buildroot.org/results/63a7cf35ecef02f30641a37d602f7cc55d59f543/ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-22 09:11:15 +02:00
Gustavo Zacarias	e44d5c947d	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>	2012-05-21 17:17:04 +02:00
Gustavo Zacarias	fce8d0765a	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>	2012-05-21 17:16:58 +02:00
Gustavo Zacarias	7a41ddd3fb	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>	2012-05-20 19:54:03 +02:00
Peter Korsgaard	8b3f94f9b0	iperf: needs MMU Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-20 19:52:35 +02:00
Peter Korsgaard	a89e0e8721	cifs-utils: needs MMU Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-20 19:50:52 +02:00
Markos Chandras	b779b6bd94	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>	2012-05-19 23:22:51 +02:00
Ludovic Desroches	38b1ba3681	apply-patches.sh: add documentation Signed-off-by: Ludovic Desroches <ludovic.desroches@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-19 20:57:55 +02:00
Gustavo Zacarias	55547775aa	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>	2012-05-19 20:55:40 +02:00
Peter Korsgaard	920544e02b	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>	2012-05-19 08:55:47 +02:00
Peter Korsgaard	e4fba5865b	binutils: fix build with external toolchains on avr32 Fixes http://autobuild.buildroot.org/results/7f0545a7c824bf0523ab3506db83f7f5c930d63d/ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2012-05-19 08:46:28 +02:00