diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2025-12-09 17:55:27 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-12-09 15:11:01 -0800 |
| commit | ad7c9ad1994617db8d5a07022e6ab243a27a191f (patch) | |
| tree | b4618b86258189c06564a8e116cf531791be83c3 | |
| parent | bf1da6d1839a353274f5e2211b1581f5d19e236c (diff) | |
| download | meta-openembedded-ad7c9ad1994617db8d5a07022e6ab243a27a191f.tar.gz | |
nftables: upgrade 1.1.5 -> 1.1.6
0001-fix-typo-in-test-script.patch
removed since it's included in 1.1.6
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch | 35 | ||||
| -rw-r--r-- | meta-networking/recipes-filter/nftables/nftables_1.1.6.bb (renamed from meta-networking/recipes-filter/nftables/nftables_1.1.5.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch b/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch deleted file mode 100644 index c0d1e33b5e..0000000000 --- a/meta-networking/recipes-filter/nftables/nftables/0001-fix-typo-in-test-script.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 956e7d89865b497f889483c90bc7fed9bec4e030 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sun, 26 Oct 2025 18:55:06 +0100 | ||
| 4 | Subject: [PATCH 1/2] fix typo in test script | ||
| 5 | |||
| 6 | While executing the test suite from tests/shell/testcases folder, a lot of errors | ||
| 7 | are displayed: | ||
| 8 | |||
| 9 | tests/shell/testcases/maps/vmap_timeout: line 48: [: : integer expected | ||
| 10 | |||
| 11 | Looking at the script, a non-existing variable (expires) is tested instead of | ||
| 12 | the existing one (expire). | ||
| 13 | |||
| 14 | This change corrects this. | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://lore.kernel.org/netfilter-devel/20251026204107.2438565-1-skandigraun@gmail.com/T/#u] | ||
| 17 | |||
| 18 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 19 | --- | ||
| 20 | tests/shell/testcases/maps/vmap_timeout | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout | ||
| 24 | index 8ac7e8e7..55d1c1b9 100755 | ||
| 25 | --- a/tests/shell/testcases/maps/vmap_timeout | ||
| 26 | +++ b/tests/shell/testcases/maps/vmap_timeout | ||
| 27 | @@ -45,7 +45,7 @@ for i in $(seq 1 100) ; do | ||
| 28 | expire=$((RANDOM%utimeout)) | ||
| 29 | |||
| 30 | expire_str="" | ||
| 31 | - if [ "$expires" -gt 0 ]; then | ||
| 32 | + if [ "$expire" -gt 0 ]; then | ||
| 33 | expire_str="expires ${expire}s" | ||
| 34 | fi | ||
| 35 | |||
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.5.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb index 5ae9fc609d..505dfc12d0 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.1.5.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.6.bb | |||
| @@ -12,10 +12,9 @@ DEPENDS = "libmnl libnftnl bison-native \ | |||
| 12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" | 12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" |
| 13 | 13 | ||
| 14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ | 14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ |
| 15 | file://0001-fix-typo-in-test-script.patch \ | ||
| 16 | file://run-ptest \ | 15 | file://run-ptest \ |
| 17 | " | 16 | " |
| 18 | SRC_URI[sha256sum] = "1daf10f322e14fd90a017538aaf2c034d7cc1eb1cc418ded47445d714ea168d4" | 17 | SRC_URI[sha256sum] = "372931bda8556b310636a2f9020adc710f9bab66f47efe0ce90bff800ac2530c" |
| 19 | 18 | ||
| 20 | inherit autotools manpages pkgconfig ptest | 19 | inherit autotools manpages pkgconfig ptest |
| 21 | 20 | ||
