Skip to contentSkip to conversation

nghttp2 Use the built-in options for removing pack tools

PATCH In review [email protected] 2 participants 3 messages Jul 20, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nghttp2 Use the built-in options for removing pack tools

From: Ed Tanous <[email protected]>

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.

---
 meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +1 -5
index 959cccf35..08b855262 100644
@@ -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"
 
Signature · 1 line
2.32.0.402.g57bb445576-goog
#1 lore raw
Quoted 12 lines · On 7/19/21 8:56 PM, [email protected] wrote:

From: Ed Tanous <[email protected]>

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.

Quoted 27 lines
---
  meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +1 -5
index 959cccf35..08b855262 100644
@@ -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 lore raw
Quoted 17 lines · Khem Raj
Quoted 12 lines · On 7/19/21 8:56 PM, [email protected] wrote:

From: Ed Tanous <[email protected]>

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.

Quoted 2 lines

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.

Quoted 31 lines

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

Quoted 27 lines
---
  meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +1 -5
index 959cccf35..08b855262 100644
@@ -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"