iptables: upgrade to 1.4.19.1

fix-iptables-extensions-build-error.patch no longer needed.

(From OE-Core rev: 02971543527e993b60132ddb101a9093efa3f324)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Cristian Iorga 2013-06-05 15:47:15 +03:00 committed by Richard Purdie
parent dfd0985065
commit d3e982a6c4
2 changed files with 2 additions and 47 deletions

View File

@ -1,44 +0,0 @@
From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001
From: Cristian Iorga <cristian.iorga@intel.com>
Date: Wed, 16 Jan 2013 20:14:43 +0200
Subject: [PATCH] extensions: fix iptables extensions build error
in cross-compilation environments
libtool is properly declared and used for cross-platform
build environments
Upstream-Status: Pending
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
extensions/GNUmakefile.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index adad4d6..befb1fb 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -13,6 +13,7 @@ xtlibdir = @xtlibdir@
CC = @CC@
CCLD = ${CC}
+LIBTOOL = @LIBTOOL@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
@@ -94,10 +95,10 @@ lib%.so: lib%.la
${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
lib%.la: lib%.lo
- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
+ ${AM_VERBOSE_CCLD} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
lib%.lo: ${srcdir}/lib%.c
- ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
+ ${AM_VERBOSE_CC} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
libxt_NOTRACK.so: libxt_CT.so
${AM_VERBOSE_GEN} ln -fs $< $@
--
1.7.10.4

View File

@ -21,12 +21,11 @@ FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
file://types.h-add-defines-that-are-required-for-if_packet.patch \
file://fix-iptables-extensions-build-error.patch \
file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
"
SRC_URI[md5sum] = "a819199d5ec013b82da13a8ffbba857e"
SRC_URI[sha256sum] = "14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c"
SRC_URI[md5sum] = "be97ce9007fa42c867901b496c935a0a"
SRC_URI[sha256sum] = "dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2"
inherit autotools