| Message ID | 20220708205048.11990-2-alex.kiernan@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/2] nftables: Disable default python PACKAGECONFIG | expand |
Ignore this, need to send a v2 On Fri, Jul 8, 2022 at 9:51 PM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > Drop backported patch. > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > ...-with-make-check-and-add-AM_CPPFLAGS.patch | 39 ------------------- > .../{nftables_1.0.2.bb => nftables_1.0.4.bb} | 9 +++-- > 2 files changed, 5 insertions(+), 43 deletions(-) > delete mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch > rename meta-networking/recipes-filter/nftables/{nftables_1.0.2.bb => nftables_1.0.4.bb} (85%) > > 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 > deleted file mode 100644 > index 65ab2dfd8c49..000000000000 > --- a/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -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.2.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > similarity index 85% > rename from meta-networking/recipes-filter/nftables/nftables_1.0.2.bb > rename to meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > index f1cfb4910138..78d71fb4c0fc 100644 > --- a/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb > +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > @@ -10,20 +10,21 @@ DEPENDS = "libmnl libnftnl bison-native \ > UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" > > SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ > - file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ > file://run-ptest \ > " > > -SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" > +SRC_URI[sha256sum] = "927fb1fea1f685a328c10cf791eb655d7e1ed49d310eea5cb3101dfd8d6cba35" > > inherit autotools manpages pkgconfig ptest > > -PACKAGECONFIG ??= "readline json" > +PACKAGECONFIG ?= "readline json" > +PACKAGECONFIG[editline] = "--with-cli=editline, --without-cli, libedit, , , linenoise readline" > PACKAGECONFIG[json] = "--with-json, --without-json, jansson" > +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, --without-cli, linenoise, , , editline readline" > 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[readline] = "--with-cli=readline, --without-cli, readline, , , editline linenoise" > PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" > > inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} > -- > 2.35.1 >
On Sat, Jul 9, 2022 at 7:08 AM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > Ignore this, need to send a v2 > do you want to rework the python packageconfig patch too ? > On Fri, Jul 8, 2022 at 9:51 PM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > > > Drop backported patch. > > > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > > --- > > ...-with-make-check-and-add-AM_CPPFLAGS.patch | 39 ------------------- > > .../{nftables_1.0.2.bb => nftables_1.0.4.bb} | 9 +++-- > > 2 files changed, 5 insertions(+), 43 deletions(-) > > delete mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch > > rename meta-networking/recipes-filter/nftables/{nftables_1.0.2.bb => nftables_1.0.4.bb} (85%) > > > > 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 > > deleted file mode 100644 > > index 65ab2dfd8c49..000000000000 > > --- a/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -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.2.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > > similarity index 85% > > rename from meta-networking/recipes-filter/nftables/nftables_1.0.2.bb > > rename to meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > > index f1cfb4910138..78d71fb4c0fc 100644 > > --- a/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb > > +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb > > @@ -10,20 +10,21 @@ DEPENDS = "libmnl libnftnl bison-native \ > > UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" > > > > SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ > > - file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ > > file://run-ptest \ > > " > > > > -SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" > > +SRC_URI[sha256sum] = "927fb1fea1f685a328c10cf791eb655d7e1ed49d310eea5cb3101dfd8d6cba35" > > > > inherit autotools manpages pkgconfig ptest > > > > -PACKAGECONFIG ??= "readline json" > > +PACKAGECONFIG ?= "readline json" > > +PACKAGECONFIG[editline] = "--with-cli=editline, --without-cli, libedit, , , linenoise readline" > > PACKAGECONFIG[json] = "--with-json, --without-json, jansson" > > +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, --without-cli, linenoise, , , editline readline" > > 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[readline] = "--with-cli=readline, --without-cli, readline, , , editline linenoise" > > PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" > > > > inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} > > -- > > 2.35.1 > > > > > -- > Alex Kiernan > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#97795): https://lists.openembedded.org/g/openembedded-devel/message/97795 > Mute This Topic: https://lists.openembedded.org/mt/92260724/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Sat, Jul 9, 2022 at 2:48 PM Khem Raj <raj.khem@gmail.com> wrote: > > On Sat, Jul 9, 2022 at 7:08 AM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > > > Ignore this, need to send a v2 > > > > do you want to rework the python packageconfig patch too ? > Yeah, I've had two or three goes at it and struggled to see how to make it cooperate...
On Sun, Jul 10, 2022 at 4:21 PM Alex Kiernan via lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org> wrote: > > On Sat, Jul 9, 2022 at 2:48 PM Khem Raj <raj.khem@gmail.com> wrote: > > > > On Sat, Jul 9, 2022 at 7:08 AM Alex Kiernan <alex.kiernan@gmail.com> wrote: > > > > > > Ignore this, need to send a v2 > > > > > > > do you want to rework the python packageconfig patch too ? > > > > Yeah, I've had two or three goes at it and struggled to see how to > make it cooperate... > I've singularly failed to make this work (short of just ripping/replacing the entire python installation process), so have sent it with the buildpaths issue still there, since the upgrade is useful regardless.
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 deleted file mode 100644 index 65ab2dfd8c49..000000000000 --- a/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -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.2.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb similarity index 85% rename from meta-networking/recipes-filter/nftables/nftables_1.0.2.bb rename to meta-networking/recipes-filter/nftables/nftables_1.0.4.bb index f1cfb4910138..78d71fb4c0fc 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb @@ -10,20 +10,21 @@ DEPENDS = "libmnl libnftnl bison-native \ UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ - file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" +SRC_URI[sha256sum] = "927fb1fea1f685a328c10cf791eb655d7e1ed49d310eea5cb3101dfd8d6cba35" inherit autotools manpages pkgconfig ptest -PACKAGECONFIG ??= "readline json" +PACKAGECONFIG ?= "readline json" +PACKAGECONFIG[editline] = "--with-cli=editline, --without-cli, libedit, , , linenoise readline" PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, --without-cli, linenoise, , , editline readline" 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[readline] = "--with-cli=readline, --without-cli, readline, , , editline linenoise" PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
Drop backported patch. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- ...-with-make-check-and-add-AM_CPPFLAGS.patch | 39 ------------------- .../{nftables_1.0.2.bb => nftables_1.0.4.bb} | 9 +++-- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch rename meta-networking/recipes-filter/nftables/{nftables_1.0.2.bb => nftables_1.0.4.bb} (85%)