Compare commits

..

6 Commits

Author SHA1 Message Date
Peter Korsgaard
facd602dca Update for 2011.08
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-31 13:44:55 +02:00
Sven Neumann
7bbc4fa063 kernel-headers: bump 3.0.x stable version
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-31 11:27:08 +02:00
Peter Korsgaard
b131d4c366 news.html: add 2011.08-rc2 announcement link
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-30 14:46:00 +02:00
Gustavo Zacarias
e1472e1449 ipset: fixup kernel checks for external toolchains
Add patch to kill kernel checks since we don't build the kernel
modules anyway.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-30 14:19:25 +02:00
Maxime Ripard
3c90f75496 Fix regression in Python build on 64 bits system
Commit 009d8fceab introduced
--enable-shared --disable-static options for the host autotools packages,
ultimately causing a regression on the host-python build, leading to
a number of critical modules not being built on the target python on
64 bits system. Introduce a quick fix for the release and before a deeper
fix.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-29 22:44:53 +02:00
Maxime Ripard
68c344a372 Fix the CodeSourcery ARM 2009q3 toolchain use
The prefix is not set when selecting this toolchain, resulting in a
build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-29 22:38:17 +02:00
9 changed files with 140 additions and 9 deletions

View File

@@ -1,3 +1,12 @@
2011.08, Released August 31th, 2011:
Fixes all over the tree.
Toolchain: Fix codesourcery 2009q3 ARM download, Linux 3.0.4
kernel headers.
Updated/fixed packages: ipset, python
2011.08-rc2, Released August 29th, 2011:
Fixes all over the tree.

View File

@@ -24,7 +24,7 @@
#--------------------------------------------------------------
# Set and export the version string
export BR2_VERSION:=2011.08-rc2
export BR2_VERSION:=2011.08
# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:

View File

@@ -6,14 +6,14 @@
<p>
The latest stable release is <b>2011.05</b>, which can be downloaded
The latest stable release is <b>2011.08</b>, which can be downloaded
here:<p>
<a href="/downloads/buildroot-2011.05.tar.gz">buildroot-2011.05.tar.gz</a>
<a href="/downloads/buildroot-2011.08.tar.gz">buildroot-2011.08.tar.gz</a>
or
<a href="/downloads/buildroot-2011.05.tar.bz2">buildroot-2011.05.tar.bz2</a>.
<a href="/downloads/buildroot-2011.08.tar.bz2">buildroot-2011.08.tar.bz2</a>.
<p>
<!--
The latest release candidate is <b>2011.08-rc2</b>, which can be
downloaded here:<p>
@@ -21,7 +21,7 @@ downloaded here:<p>
or
<a href="/downloads/buildroot-2011.08-rc2.tar.bz2">buildroot-2011.08-rc2.tar.bz2</a>.
<p>
-->
This and earlier releases can always be downloaded from
<a href="/downloads/">http://buildroot.net/downloads/</a>.

View File

@@ -5,11 +5,20 @@
<p>
<ul>
<li><b>32 August 2011 -- 2011.08 released</b>
<p>The stable 2011.08 release is out - Thanks to everyone
contributing and testing the release candidates. See the
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08">CHANGES</a>
file for more details, and go to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2011.08.tar.bz2">2011.08 release</a>.</p>
<li><b>29 August 2011 -- 2011.08-rc2 released</b>
<p>RC2 is out with more bugfixes. See the <a
href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.08_rc2">CHANGES</a>
file for details.
file for details, and read the
<a href="http://lists.busybox.net/pipermail/buildroot/2011-August/045211.html">announcement</a>.
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2011.08-rc2.tar.bz2">2011.08-rc2

View File

@@ -0,0 +1,100 @@
Drop all the kernel checks and let the user deal with having a new enough
version of the kernel to enjoy this.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
diff -Nura ipset-6.8.orig//Makefile.am ipset-6.8/Makefile.am
--- ipset-6.8.orig//Makefile.am 2011-08-17 16:10:41.999386034 -0300
+++ ipset-6.8/Makefile.am 2011-08-17 16:17:34.108702969 -0300
@@ -4,11 +4,6 @@
include $(top_srcdir)/Make_global.am
-if ! WITH_KBUILDDIR
-KBUILD_OUTPUT=/lib/modules/`uname -r`/build
-else
-KBUILD_OUTPUT=$(KBUILDDIR)
-endif
if ! WITH_MAXSETS
IP_SET_MAX=256
else
@@ -22,23 +17,6 @@
SUBDIRS = lib src
-modules_sparse:
- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
- V=$V C=2 CF=-D__CHECK_ENDIAN__ \
- IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
-
-modules:
- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
- IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
-
-modules_install:
- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
- KDIR=$$PWD/kernel modules_install
-
-modules_clean:
- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
- KDIR=$$PWD/kernel clean
-
update_includes:
./update ip_set.h
./update ip_set_bitmap.h
diff -Nura ipset-6.8.orig//configure.ac ipset-6.8/configure.ac
--- ipset-6.8.orig//configure.ac 2011-08-17 16:10:42.015387986 -0300
+++ ipset-6.8/configure.ac 2011-08-17 16:18:01.578056869 -0300
@@ -11,51 +11,6 @@
*) AC_MSG_ERROR([Linux systems supported exclusively!]);;
esac
-dnl Additional arguments
-dnl Kernel build directory or source tree
-AC_ARG_WITH([kbuild],
- AS_HELP_STRING([--with-kbuild=PATH],
- [Path to kernel build directory]),
- [KBUILDDIR="$withval";])
-AC_ARG_WITH([ksource],
- AS_HELP_STRING([--with-ksource=PATH],
- [Path to kernel source directory, if not the same as the kernel build directory]),
- [KSOURCEDIR="$withval";])
-AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
-AC_SUBST(KBUILDDIR)
-
-dnl Sigh: check kernel version dependencies
-if test "$KBUILDDIR" != ""
-then
- kbuilddir="$KBUILDDIR"
-else
- kbuilddir="/lib/modules/`uname -r`/build"
-fi
-
-if test -n "$KSOURCEDIR"; then
- ksourcedir="$KSOURCEDIR"
-elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
- ksourcedir="$kbuilddir"
-else
- ksourcedir="/lib/modules/$(uname -r)/source"
-fi
-if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
-then
- AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
-fi
-
-if test ! -e "$kbuilddir/.config"
-then
- AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
-fi
-
-AC_PROG_GREP
-
-if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
-then
- AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
-fi
-
dnl Maximal number of sets supported by the kernel, default 256
AC_ARG_WITH([maxsets],
AS_HELP_STRING([--with-maxsets=256],

View File

@@ -9,6 +9,5 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_AUTORECONF = YES
IPSET_DEPENDENCIES = libmnl host-pkg-config
IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)
$(eval $(call AUTOTARGETS,package,ipset))

View File

@@ -37,6 +37,19 @@ HOST_PYTHON_MAKE_ENV = \
HOST_PYTHON_AUTORECONF = YES
define HOST_PYTHON_CONFIGURE_CMDS
(cd $(@D) && rm -rf config.cache; \
$(HOST_CONFIGURE_OPTS) \
CFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_PYTHON_CONF_ENV) \
./configure \
--prefix="$(HOST_DIR)/usr" \
--sysconfdir="$(HOST_DIR)/etc" \
$(HOST_PYTHON_CONF_OPT) \
)
endef
PYTHON_DEPENDENCIES = host-python libffi
HOST_PYTHON_DEPENDENCIES = host-expat

View File

@@ -54,6 +54,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37
default "2.6.38.8" if BR2_KERNEL_HEADERS_2_6_38
default "2.6.39.4" if BR2_KERNEL_HEADERS_2_6_39
default "3.0.3" if BR2_KERNEL_HEADERS_3_0
default "3.0.4" if BR2_KERNEL_HEADERS_3_0
default "2.6" if BR2_KERNEL_HEADERS_SNAP
default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

View File

@@ -214,6 +214,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
config BR2_TOOLCHAIN_EXTERNAL_PREFIX
string
default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103