From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../0001-update-python3-nftables-reference.patch | 47 ---------------------- .../recipes-filter/nftables/nftables_0.9.3.bb | 33 --------------- .../recipes-filter/nftables/nftables_0.9.4.bb | 32 +++++++++++++++ 3 files changed, 32 insertions(+), 80 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb (limited to 'meta-openembedded/meta-networking/recipes-filter/nftables') diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch deleted file mode 100644 index db2243480d..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-update-python3-nftables-reference.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ddbe652bf0f4ed300bae9497250130d68e4cbf5b Mon Sep 17 00:00:00 2001 -From: Arturo Borrero Gonzalez -Date: Tue, 10 Dec 2019 12:00:45 +0100 -Subject: py: load the SONAME-versioned shared object - -Instruct the python module to load the SONAME versioned shared object. - -Normal end-user systems may only have available libnftables.so.1.0.0 and not -libnftables.so which is usually only present in developer systems. - -In Debian systems, for example: - - % dpkg -L libnftables1 | grep so.1 - /usr/lib/x86_64-linux-gnu/libnftables.so.1.0.0 - /usr/lib/x86_64-linux-gnu/libnftables.so.1 - - % dpkg -L libnftables-dev | grep so - /usr/lib/x86_64-linux-gnu/libnftables.so - -The "1" is not a magic number, is the SONAME of libnftables in the current -version, as stated in Make_global.am. - -Reported-by: Michael Biebl -Signed-off-by: Arturo Borrero Gonzalez -Acked-by: Phil Sutter -Signed-off-by: Pablo Neira Ayuso ---- - py/nftables.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py/nftables.py b/py/nftables.py -index 48eb54fe..2a0a1e89 100644 ---- a/py/nftables.py -+++ b/py/nftables.py -@@ -64,7 +64,7 @@ class Nftables: - - validator = None - -- def __init__(self, sofile="libnftables.so"): -+ def __init__(self, sofile="libnftables.so.1"): - """Instantiate a new Nftables class object. - - Accepts a shared object file to open, by default standard search path --- -cgit v1.2.1 - - diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb deleted file mode 100644 index 65a7bcc5ff..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" - -DEPENDS = "libmnl libnftnl bison-native \ - ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" - -# Ensure we reject the 0.099 version by matching at least two dots -UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ - file://0001-update-python3-nftables-reference.patch" -SRC_URI[md5sum] = "9913b2b46864394d41916b74638e0875" -SRC_URI[sha256sum] = "956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78" - -inherit autotools manpages pkgconfig - -PACKAGECONFIG ??= "python readline" -PACKAGECONFIG[json] = "--with-json, --without-json, jansson" -PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" -PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" -PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" -PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} - -RRECOMMENDS_${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb new file mode 100644 index 0000000000..5b57abb87a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb @@ -0,0 +1,32 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +# Ensure we reject the 0.099 version by matching at least two dots +UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" +SRC_URI[md5sum] = "fdfd51a1083fb054a487b5159b1ed5cd" +SRC_URI[sha256sum] = "08b8683a9db5fba980bc092b75288af98d218bbe8ab446daf2338570d0730f9a" + +inherit autotools manpages pkgconfig + +PACKAGECONFIG ??= "python readline" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" +PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + +RRECOMMENDS_${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +RDEPENDS_${PN}-python = "python3-core python3-json" -- cgit v1.2.3