[meta-networking][PATCH] nghttp2 Use the built-in options for removing pack tools

[meta-networking][PATCH] nghttp2 Use the built-in options for removing pack tools

[ed]

From: Ed Tanous <ed@tanous.net>

For distros that want to use the ENABLE_LIB_ONLY option, the rm call in
the do_install_append() will fail, because ENABLE_HPACK_TOOLS (set
implicitly as part of ENABLE_LIB_ONLY) removes those two binaries from
the build, so they then can't be removed again.  It appears that nghttp2
has added explicit options for this use case, so this commit sets
ENABLE_HPACK_TOOLS=OFF, which not only allows for the option to be
overridden in other meta layers, also allows a simplified use of
ENABLE_LIB_ONLY in meta layers that don't want to ship any of the
binaries.

Signed-off-by: Ed Tanous <ed@tanous.net>
---
 meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
index 959cccf35..08b855262 100644
--- a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
+++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
@@ -18,11 +18,7 @@ PACKAGECONFIG[manpages] = ""
 
 # examples are never installed, and don't need to be built in the
 # first place
-EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON"
-
-do_install_append() {
-	rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd
-}
+EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF"
 
 PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
 
-- 
2.32.0.402.g57bb445576-goog

Re: [oe] [meta-networking][PATCH] nghttp2 Use the built-in options for removing pack tools

[Khem Raj]

On 7/19/21 8:56 PM, ed@tanous.net wrote:
> From: Ed Tanous <ed@tanous.net>
> 
> For distros that want to use the ENABLE_LIB_ONLY option, the rm call in
> the do_install_append() will fail, because ENABLE_HPACK_TOOLS (set
> implicitly as part of ENABLE_LIB_ONLY) removes those two binaries from
> the build, so they then can't be removed again.  It appears that nghttp2
> has added explicit options for this use case, so this commit sets
> ENABLE_HPACK_TOOLS=OFF, which not only allows for the option to be
> overridden in other meta layers, also allows a simplified use of
> ENABLE_LIB_ONLY in meta layers that don't want to ship any of the
> binaries.
> 

this is already applied to master via
https://git.openembedded.org/meta-openembedded/commit/?id=df8ecfeacfc84a34a0696a48f3a1dc6d83496271

so is it that you are proposing it for release branches.
if so then indicate that in patch header.

> Signed-off-by: Ed Tanous <ed@tanous.net>
> ---
>   meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> index 959cccf35..08b855262 100644
> --- a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> +++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> @@ -18,11 +18,7 @@ PACKAGECONFIG[manpages] = ""
>   
>   # examples are never installed, and don't need to be built in the
>   # first place
> -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON"
> -
> -do_install_append() {
> -	rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd
> -}
> +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF"
>   
>   PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
>   
> 
> 
> 
> 
> 

Re: [oe] [meta-networking][PATCH] nghttp2 Use the built-in options for removing pack tools

[ed]

On Tue, Jul 20, 2021 at 9:55 AM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 7/19/21 8:56 PM, ed@tanous.net wrote:
> > From: Ed Tanous <ed@tanous.net>
> >
> > For distros that want to use the ENABLE_LIB_ONLY option, the rm call in
> > the do_install_append() will fail, because ENABLE_HPACK_TOOLS (set
> > implicitly as part of ENABLE_LIB_ONLY) removes those two binaries from
> > the build, so they then can't be removed again.  It appears that nghttp2
> > has added explicit options for this use case, so this commit sets
> > ENABLE_HPACK_TOOLS=OFF, which not only allows for the option to be
> > overridden in other meta layers, also allows a simplified use of
> > ENABLE_LIB_ONLY in meta layers that don't want to ship any of the
> > binaries.
> >
>
> this is already applied to master via
> https://git.openembedded.org/meta-openembedded/commit/?id=df8ecfeacfc84a34a0696a48f3a1dc6d83496271

Apologies, I did not see it hit master and assumed it was being
ignored because I missed the extra subject line on my first
submission.  Feel free to ignore this second submission.

Thank you.

>
> so is it that you are proposing it for release branches.
> if so then indicate that in patch header.
>
> > Signed-off-by: Ed Tanous <ed@tanous.net>
> > ---
> >   meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
> >   1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> > index 959cccf35..08b855262 100644
> > --- a/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> > +++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb
> > @@ -18,11 +18,7 @@ PACKAGECONFIG[manpages] = ""
> >
> >   # examples are never installed, and don't need to be built in the
> >   # first place
> > -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON"
> > -
> > -do_install_append() {
> > -     rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd
> > -}
> > +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF"
> >
> >   PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
> >
> >
> >
> >
> > 
> >