From df8ecfeacfc84a34a0696a48f3a1dc6d83496271 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 16 Jun 2021 11:19:56 -0700 Subject: Use the built-in options for removing pack tools 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. Signed-off-by: Ed Tanous Signed-off-by: Khem Raj --- 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 959cccf357..08b8552622 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" -- cgit 1.2.3-korg