Skip to contentSkip to conversation

Use the built-in options for removing pack tools

PATCH In review [email protected] 2 participants 2 messages Jun 16, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 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. 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 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.272.g935e593368-goog
#1 lore raw
Quoted 10 lines · On 6/16/21 11:19 AM, [email protected] wrote:

From: Ed Tanous <[email protected]>

For distros that want to use the ENABLE_LIB_ONLY option, the rm call 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. 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 the binaries.

Quoted 4 lines
---
  meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)

Thanks for this patch, this is wrong list for meta-openembedded patches, please send meta-openembedded patches to [email protected] ml

Quoted 23 lines
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"