summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES33
-rw-r--r--Config.in7
-rw-r--r--Makefile5
-rw-r--r--configs/qemu_arm_versatile_defconfig2
-rw-r--r--configs/qemu_arm_vexpress_defconfig2
-rw-r--r--configs/qemu_microblazebe_mmu_defconfig2
-rw-r--r--configs/qemu_microblazeel_mmu_defconfig2
-rw-r--r--configs/qemu_mips_malta_defconfig2
-rw-r--r--configs/qemu_mipsel_malta_defconfig2
-rw-r--r--configs/qemu_ppc_g3beige_defconfig2
-rw-r--r--configs/qemu_ppc_mpc8544ds_defconfig2
-rw-r--r--configs/qemu_sh4_r2d_defconfig2
-rw-r--r--configs/qemu_sparc_ss10_defconfig2
-rw-r--r--configs/qemu_x86_64_defconfig2
-rw-r--r--configs/qemu_x86_defconfig2
-rw-r--r--docs/docs.html13
-rw-r--r--docs/download.html16
-rw-r--r--docs/header.html2
-rw-r--r--docs/news.html37
-rw-r--r--linux/Config.in4
-rw-r--r--package/apr-util/Config.in2
-rw-r--r--package/apr/Config.in2
-rw-r--r--package/binutils/binutils.mk5
-rw-r--r--package/bison/Config.in2
-rw-r--r--package/busybox/Config.in2
-rw-r--r--package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch11
-rw-r--r--package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch17
-rw-r--r--package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch22
-rw-r--r--package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch29
-rw-r--r--package/ccache/ccache.mk24
-rw-r--r--package/cifs-utils/Config.in2
-rw-r--r--package/crosstool-ng/crosstool-ng.mk2
-rw-r--r--package/directfb/Config.in4
-rw-r--r--package/directfb/directfb.mk3
-rw-r--r--package/dnsmasq/dnsmasq.mk4
-rw-r--r--package/games/gnuchess/Config.in4
-rw-r--r--package/gpsd/gpsd-navcom.patch (renamed from package/gpsd/gpsd-2.95-navcom.patch)0
-rw-r--r--package/heirloom-mailx/heirloom-mailx.mk4
-rw-r--r--package/iperf/Config.in2
-rw-r--r--package/libmpeg2/libmpeg2-0.5.1-armv4l.patch (renamed from package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch)0
-rw-r--r--package/mtd/mtd.mk5
-rw-r--r--package/ndisc6/ndisc6.mk5
-rw-r--r--package/netsnmp/netsnmp.mk1
-rw-r--r--package/ntfs-3g/ntfs-3g.mk1
-rw-r--r--package/opencv/opencv.mk2
-rw-r--r--package/openssl/openssl.mk2
-rw-r--r--package/oprofile/oprofile.mk5
-rw-r--r--package/pkg-download.mk2
-rw-r--r--package/pptp-linux/pptp-linux.mk1
-rw-r--r--package/socat/socat-no-documentation.patch37
-rw-r--r--package/socat/socat.mk15
-rw-r--r--package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch25
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk1
-rwxr-xr-xsupport/scripts/apply-patches.sh23
-rw-r--r--toolchain/gdb/Config.in2
-rw-r--r--toolchain/kernel-headers/Config.in6
-rw-r--r--toolchain/kernel-headers/linux-3.0.32-headers_install-fix-__packed-in-exported-kernel-head.patch (renamed from toolchain/kernel-headers/linux-3.0.31-headers_install-fix-__packed-in-exported-kernel-head.patch)0
-rw-r--r--toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch (renamed from toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch)0
-rw-r--r--toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc4
-rw-r--r--toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc4
-rw-r--r--toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc4
-rw-r--r--toolchain/toolchain-external/ext-tool.mk9
-rw-r--r--toolchain/uClibc/Config.in2
-rw-r--r--toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch28
-rw-r--r--toolchain/uClibc/uClibc-0.9.33.1-version.patch23
-rw-r--r--toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch (renamed from toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch)0
-rw-r--r--toolchain/uClibc/uClibc-0.9.33.2-dup3.patch (renamed from toolchain/uClibc/uClibc-0.9.33.1-dup3.patch)0
67 files changed, 281 insertions, 208 deletions
diff --git a/CHANGES b/CHANGES
index 6b01c04..b526c58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,35 @@
-2012.05-rc1, Released May 10th, 2012
+2012.08, Not released yet:
+
+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.
+
+ 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/Config.in b/Config.in
index 68abb9b..95c2e8c 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 96f9412..9a9634d 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.08-git
# Check for minimal make version (note: this check will break at make 10.x)
MIN_MAKE_VERSION=3.81
@@ -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/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index dc5ca11..5385f28 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.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 5f355b8..9596fe5 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.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 156e264..387466b 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.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 26897b7..7034447 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.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 e36ac56..57f3ae1 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.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 8e21f1b..4a4879c 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.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 6a673e9..1e297e5 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.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 a1aebf1..44c81de 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.7"
BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index 58ace03..a580870 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.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
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index cc75506..7ac66af 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.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 93008eb..7c6f311 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.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 1aa44b3..118cd7f 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.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"
diff --git a/docs/docs.html b/docs/docs.html
index 851d1d2..65eaff1 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>
diff --git a/docs/download.html b/docs/download.html
index 7b22569..d23e7e9 100644
--- 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-rc1</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-rc1.tar.gz">buildroot-2012.05-rc1.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-rc1.tar.bz2">buildroot-2012.05-rc1.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>.
diff --git a/docs/header.html b/docs/header.html
index ce5d555..aa16d54 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>
diff --git a/docs/news.html b/docs/news.html
index 8c4871f..8b52650 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,12 +5,47 @@
<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
+ 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
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
diff --git a/linux/Config.in b/linux/Config.in
index 7595a4a..4562b1b 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.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.5" 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
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index 99b32f2..895dbb8 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 292cadb..ed319ed 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
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 0a5a948..1c8a79d 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
diff --git a/package/bison/Config.in b/package/bison/Config.in
index da0ac3f..1a485c4 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
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 946134d..a078644 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 b9d2a5e..0000000
--- a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch
+++ /dev/null
@@ -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
-
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 ed52159..0000000
--- 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 ee236ff..0000000
--- 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-sed.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch
deleted file mode 100644
index 70dc63f..0000000
--- 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;
-
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index f71376e..d7106ee 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))
diff --git a/package/cifs-utils/Config.in b/package/cifs-utils/Config.in
index 4331986..b433850 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
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index 3540f70..09c57ec 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))
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 26f5091..47f9fea 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 7aa0398..071cdf4 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
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 2e3575c..4aa7cfb 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^' \
diff --git a/package/games/gnuchess/Config.in b/package/games/gnuchess/Config.in
index cae05cb..c79c52d 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
diff --git a/package/gpsd/gpsd-2.95-navcom.patch b/package/gpsd/gpsd-navcom.patch
index 659cea1..659cea1 100644
--- a/package/gpsd/gpsd-2.95-navcom.patch
+++ b/package/gpsd/gpsd-navcom.patch
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index 2b28a3f..b1779c0 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
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c4c25b3..c284bfd 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.
diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch b/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch
index 70d45ef..70d45ef 100644
--- a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch
+++ b/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 3bcefa5..d7947b1 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##*/} ; \
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index 8451e06..7cf4b8a 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
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 448e3fd..6d67dc5 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")
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 8e616cb..748fe1d 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
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index d415e51..ec94715 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
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 748252c..62861c5 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
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 5da794b..fc21928 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
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index b833de9..7d1e543 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 ; \
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 77ae34d..d4c5bc4 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= \
diff --git a/package/socat/socat-no-documentation.patch b/package/socat/socat-no-documentation.patch
new file mode 100644
index 0000000..ce088df
--- /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
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 5f7feac..bd435cf 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))
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 0000000..a2a0623
--- /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
+
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index df7ba9a..29f7c81 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
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index f82be86..7a6c1fa 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-.}
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index c9c54b8..fd6956b 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.
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b3fb362..17fe797 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.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.16" if BR2_KERNEL_HEADERS_3_2
- default "3.3.5" 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 "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-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
index 8777b71..8777b71 100644
--- 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
diff --git a/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
index 9663662..9663662 100644
--- a/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch
+++ b/toolchain/kernel-headers/linux-3.3.7-fix-umode_t.patch
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index cbad52a..58cdff2 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 e57a91d..db724ab 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 c115096..5f1ee7e 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
#
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b163aee..3f58aad 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 ; \
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 160ead4..d8b8a2a 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 8b08a2c..0000000
--- 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 37f8565..0000000
--- 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
index c699b6b..c699b6b 100644
--- 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
diff --git a/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
index 66b419e..66b419e 100644
--- a/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch
+++ b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch