From b9e3ddaefdc679d23301da5de0292f3c67ab9cc4 Mon Sep 17 00:00:00 2001
From: wangmy <wangmy@fujitsu.com>
Date: Mon, 13 Jun 2022 17:00:17 +0800
Subject: libnftnl: upgrade 1.2.1 -> 1.2.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 6d997c52c5643c5d92cc6bdf77beae7ae3b300e9)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../recipes-filter/libnftnl/libnftnl_1.2.1.bb      | 41 ----------------------
 .../recipes-filter/libnftnl/libnftnl_1.2.2.bb      | 41 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb
 create mode 100644 meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb

(limited to 'meta-networking')

diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb
deleted file mode 100644
index 44479638f1..0000000000
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
-SECTION = "libs"
-DEPENDS = "libmnl"
-
-SRCREV = "09456c720e9c00eecc08e41ac6b7c291b3821ee5"
-SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
-           file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
-           file://0001-configure.ac-Add-serial-tests.patch \
-           file://run-ptest \
-           "
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig ptest
-
-RDEPENDS:${PN}-ptest += " bash python3-core make"
- 
-TESTDIR = "tests"
-
-do_compile_ptest() {
-    cp -rf ${S}/build-aux .
-    oe_runmake buildtest-TESTS
-}
- 
-do_install_ptest() {
-    cp -rf ${B}/build-aux ${D}${PTEST_PATH}
-    install -d ${D}${PTEST_PATH}/${TESTDIR}
-    cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR}
-
-    # the binaries compiled in ${TESTDIR} will look for a compiler to
-    # use, which will cause failures. Substitute the binaries in
-    # ${TESTDIR}/.libs instead
-    cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR}
-
-    # Alter the Makefile so that it does not try and rebuild anything in
-    # other nonexistent paths before running the actual tests
-    sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-}
-
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb
new file mode 100644
index 0000000000..3eca92dcec
--- /dev/null
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
+SECTION = "libs"
+DEPENDS = "libmnl"
+
+SRCREV = "f6575131e60ab10f131ea3ff36f69af2b6c3f614"
+SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
+           file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
+           file://0001-configure.ac-Add-serial-tests.patch \
+           file://run-ptest \
+           "
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig ptest
+
+RDEPENDS:${PN}-ptest += " bash python3-core make"
+ 
+TESTDIR = "tests"
+
+do_compile_ptest() {
+    cp -rf ${S}/build-aux .
+    oe_runmake buildtest-TESTS
+}
+ 
+do_install_ptest() {
+    cp -rf ${B}/build-aux ${D}${PTEST_PATH}
+    install -d ${D}${PTEST_PATH}/${TESTDIR}
+    cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR}
+
+    # the binaries compiled in ${TESTDIR} will look for a compiler to
+    # use, which will cause failures. Substitute the binaries in
+    # ${TESTDIR}/.libs instead
+    cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR}
+
+    # Alter the Makefile so that it does not try and rebuild anything in
+    # other nonexistent paths before running the actual tests
+    sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+}
+
-- 
cgit v1.2.3-54-g00ecf