diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2022-03-22 12:46:13 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
| commit | 03e4ec7184b1303264640844562f2345dfed6650 (patch) | |
| tree | 14422361742c036d1e995692e1264a038aaf21b2 /meta-networking | |
| parent | 013a702fd151293f97da552b4261f2059db934db (diff) | |
| download | meta-openembedded-contrib-03e4ec7184b1303264640844562f2345dfed6650.tar.gz | |
nftables: upgrade 1.0.1 -> 1.0.2
Backport a patch to fix build error:
../../nftables-1.0.2/examples/nft-buffer.c:3:10: fatal error: nftables/libnftables.h: No such file or directory
3 | #include <nftables/libnftables.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch | 39 | ||||
| -rw-r--r-- | meta-networking/recipes-filter/nftables/nftables_1.0.2.bb (renamed from meta-networking/recipes-filter/nftables/nftables_1.0.1.bb) | 7 |
2 files changed, 44 insertions, 2 deletions
diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch b/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch new file mode 100644 index 0000000000..65ab2dfd8c --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch @@ -0,0 +1,39 @@ +From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso <pablo@netfilter.org> +Date: Tue, 22 Feb 2022 00:56:36 +0100 +Subject: [PATCH] examples: compile with `make check' and add AM_CPPFLAGS + +Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to +specify local headers via -I. + +Unfortunately, `make distcheck' did not catch this compile time error in +my system, since it was using the nftables/libnftables.h file of the +previous nftables release. + +Fixes: 5b364657a35f ("build: missing SUBIRS update") +Fixes: caf2a6ad2d22 ("examples: add libnftables example program") +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +Upstream-Status: Backport +[http://git.netfilter.org/nftables/commit/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + examples/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index c972170d..3b8b0b67 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,6 @@ +-noinst_PROGRAMS = nft-buffer \ ++check_PROGRAMS = nft-buffer \ + nft-json-file + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + LDADD = $(top_builddir)/src/libnftables.la +-- +2.25.1 + diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb index 2c378e8fd9..fd8e26ed1a 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb @@ -9,8 +9,11 @@ DEPENDS = "libmnl libnftnl bison-native \ # Ensure we reject the 0.099 version by matching at least two dots UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423" +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ + file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ + " + +SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" inherit autotools manpages pkgconfig |