diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-27 16:25:44 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-01 12:38:07 +0100 |
commit | 813bbb84859d149d31705cc5703cda4354d50103 (patch) | |
tree | 7145337a8b6acfb60133115eac569e5f9051bc0c /meta/recipes-extended | |
parent | 2e14c61e5606db5f31c4953545b5e636391bfebe (diff) | |
download | poky-813bbb84859d149d31705cc5703cda4354d50103.tar.gz |
iptables: upgrade to version 1.4.13
Remove a patch since it is already in upstream.
(From OE-Core rev: 90f32e0fffaef55415088f523e282ca3c08fa7ee)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/GNUmakefile.patch | 18 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.4.13.bb (renamed from meta/recipes-extended/iptables/iptables_1.4.12.2.bb) | 5 |
2 files changed, 2 insertions, 21 deletions
diff --git a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch b/meta/recipes-extended/iptables/iptables/GNUmakefile.patch deleted file mode 100644 index c60e84f0a2..0000000000 --- a/meta/recipes-extended/iptables/iptables/GNUmakefile.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Don't check unknown symbols. | ||
2 | |||
3 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | diff -r abb89394ce0c extensions/GNUmakefile.in | ||
8 | --- a/extensions/GNUmakefile.in Mon Jan 23 00:12:27 2012 +0800 | ||
9 | +++ b/extensions/GNUmakefile.in Mon Jan 23 00:38:32 2012 +0800 | ||
10 | @@ -68,7 +68,7 @@ | ||
11 | |||
12 | .PHONY: all install clean distclean FORCE | ||
13 | |||
14 | -all: ${targets} check | ||
15 | +all: ${targets} | ||
16 | |||
17 | check: ${targets} | ||
18 | @echo " CHECK unknown symbols in .so files"; \ | ||
diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb b/meta/recipes-extended/iptables/iptables_1.4.13.bb index 663ddadd40..59782c0175 100644 --- a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb +++ b/meta/recipes-extended/iptables/iptables_1.4.13.bb | |||
@@ -22,11 +22,10 @@ FILES_${PN} =+ "${libdir}/xtables/" | |||
22 | FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" | 22 | FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" |
23 | 23 | ||
24 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ | 24 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ |
25 | file://GNUmakefile.patch \ | ||
26 | file://types.h-add-defines-that-are-required-for-if_packet.patch" | 25 | file://types.h-add-defines-that-are-required-for-if_packet.patch" |
27 | 26 | ||
28 | SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c" | 27 | SRC_URI[md5sum] = "40a15608ec57b50e9377cace546dd115" |
29 | SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13" | 28 | SRC_URI[sha256sum] = "321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded" |
30 | 29 | ||
31 | inherit autotools | 30 | inherit autotools |
32 | 31 | ||