* [Buildroot] [PATCH 1/2] ipset: bump to version 6.10
@ 2011-12-02 20:45 Gustavo Zacarias
2011-12-02 20:45 ` [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2 Gustavo Zacarias
2011-12-09 8:44 ` [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2011-12-02 20:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ipset/ipset-drop-modules.patch | 100 --------------------------------
package/ipset/ipset.mk | 2 +-
2 files changed, 1 insertions(+), 101 deletions(-)
delete mode 100644 package/ipset/ipset-drop-modules.patch
diff --git a/package/ipset/ipset-drop-modules.patch b/package/ipset/ipset-drop-modules.patch
deleted file mode 100644
index ee29d43..0000000
--- a/package/ipset/ipset-drop-modules.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Drop all the kernel checks and let the user deal with having a new enough
-version of the kernel to enjoy this.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-
-diff -Nura ipset-6.8.orig//Makefile.am ipset-6.8/Makefile.am
---- ipset-6.8.orig//Makefile.am 2011-08-17 16:10:41.999386034 -0300
-+++ ipset-6.8/Makefile.am 2011-08-17 16:17:34.108702969 -0300
-@@ -4,11 +4,6 @@
-
- include $(top_srcdir)/Make_global.am
-
--if ! WITH_KBUILDDIR
--KBUILD_OUTPUT=/lib/modules/`uname -r`/build
--else
--KBUILD_OUTPUT=$(KBUILDDIR)
--endif
- if ! WITH_MAXSETS
- IP_SET_MAX=256
- else
-@@ -22,23 +17,6 @@
-
- SUBDIRS = lib src
-
--modules_sparse:
-- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
-- V=$V C=2 CF=-D__CHECK_ENDIAN__ \
-- IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules:
-- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
-- IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules_install:
-- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
-- KDIR=$$PWD/kernel modules_install
--
--modules_clean:
-- ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
-- KDIR=$$PWD/kernel clean
--
- update_includes:
- ./update ip_set.h
- ./update ip_set_bitmap.h
-diff -Nura ipset-6.8.orig//configure.ac ipset-6.8/configure.ac
---- ipset-6.8.orig//configure.ac 2011-08-17 16:10:42.015387986 -0300
-+++ ipset-6.8/configure.ac 2011-08-17 16:18:01.578056869 -0300
-@@ -11,51 +11,6 @@
- *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
- esac
-
--dnl Additional arguments
--dnl Kernel build directory or source tree
--AC_ARG_WITH([kbuild],
-- AS_HELP_STRING([--with-kbuild=PATH],
-- [Path to kernel build directory]),
-- [KBUILDDIR="$withval";])
--AC_ARG_WITH([ksource],
-- AS_HELP_STRING([--with-ksource=PATH],
-- [Path to kernel source directory, if not the same as the kernel build directory]),
-- [KSOURCEDIR="$withval";])
--AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
--AC_SUBST(KBUILDDIR)
--
--dnl Sigh: check kernel version dependencies
--if test "$KBUILDDIR" != ""
--then
-- kbuilddir="$KBUILDDIR"
--else
-- kbuilddir="/lib/modules/`uname -r`/build"
--fi
--
--if test -n "$KSOURCEDIR"; then
-- ksourcedir="$KSOURCEDIR"
--elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
-- ksourcedir="$kbuilddir"
--else
-- ksourcedir="/lib/modules/$(uname -r)/source"
--fi
--if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
--then
-- AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
--fi
--
--if test ! -e "$kbuilddir/.config"
--then
-- AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
--fi
--
--AC_PROG_GREP
--
--if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
--then
-- AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
--fi
--
- dnl Maximal number of sets supported by the kernel, default 256
- AC_ARG_WITH([maxsets],
- AS_HELP_STRING([--with-maxsets=256],
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index f98f73f..6294234 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
#
#############################################################
-IPSET_VERSION = 6.9.1
+IPSET_VERSION = 6.10
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_AUTORECONF = YES
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2
2011-12-02 20:45 [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Gustavo Zacarias
@ 2011-12-02 20:45 ` Gustavo Zacarias
2011-12-04 10:47 ` Baruch Siach
2011-12-09 8:44 ` [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2011-12-02 20:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ebtables/ebtables.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 6cfdfdc..66242a4 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -3,7 +3,8 @@
# ebtables
#
#############################################################
-EBTABLES_VERSION = 2.0.10-1
+
+EBTABLES_VERSION = 2.0.10-2
EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2
2011-12-02 20:45 ` [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2 Gustavo Zacarias
@ 2011-12-04 10:47 ` Baruch Siach
2011-12-04 11:45 ` Gustavo Zacarias
0 siblings, 1 reply; 6+ messages in thread
From: Baruch Siach @ 2011-12-04 10:47 UTC (permalink / raw)
To: buildroot
Hi Gustavo,
On Fri, Dec 02, 2011 at 05:45:49PM -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/ebtables/ebtables.mk | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
> index 6cfdfdc..66242a4 100644
> --- a/package/ebtables/ebtables.mk
> +++ b/package/ebtables/ebtables.mk
> @@ -3,7 +3,8 @@
> # ebtables
> #
> #############################################################
> -EBTABLES_VERSION = 2.0.10-1
> +
> +EBTABLES_VERSION = 2.0.10-2
> EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
> EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
Version 2.0.10-3 has now been released. Care to update?
baruch
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2
2011-12-04 10:47 ` Baruch Siach
@ 2011-12-04 11:45 ` Gustavo Zacarias
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2011-12-04 11:45 UTC (permalink / raw)
To: buildroot
On 04.12.2011 07:47, Baruch Siach wrote:
> Version 2.0.10-3 has now been released. Care to update?
>
> baruch
Things that happen, sent, thanks for ponting it out.
Regards.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] ipset: bump to version 6.10
2011-12-02 20:45 [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Gustavo Zacarias
2011-12-02 20:45 ` [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2 Gustavo Zacarias
@ 2011-12-09 8:44 ` Peter Korsgaard
2011-12-09 12:18 ` Gustavo Zacarias
1 sibling, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2011-12-09 8:44 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/ipset/ipset-drop-modules.patch | 100 --------------------------------
Why did you drop this patch? The build fails here as it ends up looking
at my host modules:
configure: error: Invalid kernel source directory /lib/modules/3.1.1/source
make: *** [/home/peko/source/buildroot/output/build/ipset-6.10/.stamp_configured] Error 1
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] ipset: bump to version 6.10
2011-12-09 8:44 ` [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Peter Korsgaard
@ 2011-12-09 12:18 ` Gustavo Zacarias
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2011-12-09 12:18 UTC (permalink / raw)
To: buildroot
On 09.12.2011 05:44, Peter Korsgaard wrote:
>>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
>
> Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Gustavo> ---
> Gustavo> package/ipset/ipset-drop-modules.patch | 100
> --------------------------------
>
> Why did you drop this patch? The build fails here as it ends up
> looking
> at my host modules:
>
> configure: error: Invalid kernel source directory
> /lib/modules/3.1.1/source
> make: ***
>
> [/home/peko/source/buildroot/output/build/ipset-6.10/.stamp_configured]
> Error 1
On my tests it works autodetecting that it doesn't need to, it's new to
version 6.10.
Try the v2 patch which forces it to no, something different in your
config and/or host probably triggers the autodetection to think it does.
Regards.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-09 12:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-02 20:45 [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Gustavo Zacarias
2011-12-02 20:45 ` [Buildroot] [PATCH 2/2] ebtables: bump to version 2.0.10-2 Gustavo Zacarias
2011-12-04 10:47 ` Baruch Siach
2011-12-04 11:45 ` Gustavo Zacarias
2011-12-09 8:44 ` [Buildroot] [PATCH 1/2] ipset: bump to version 6.10 Peter Korsgaard
2011-12-09 12:18 ` Gustavo Zacarias
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.