[openwrt/openwrt] apk: host: make the help available

LEDE Commits lede-commits at lists.infradead.org
Tue Jun 11 14:59:10 PDT 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/b2a84c86e3a2bd399761055f84a81e2aebe436e2

commit b2a84c86e3a2bd399761055f84a81e2aebe436e2
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Mon Jun 10 09:43:23 2024 +0000

    apk: host: make the help available
    
    Currently, the apk utility lacks accessible help documentation, making
    it cumbersome for human users:
    
     apk-tools 3.0.0_pre20240519, compiled for x86_64.
    
     ERROR: This apk-tools has been built without help
    
    This absence of help forces users to delve into the apk's build
    directory to understand its functionality. To enhance usability, we will
    enable the help feature for the host build. The host environment can
    accommodate the 3% increase in binary size for the added convenience.
    
    On Ubuntu 22.04, x86_64 platform, the apk size increases by 17,816 bytes
    (from 594,144 to 611,960 bytes), a 2.99% increase. This is a reasonable
    trade-off for improved ergonomics.
    
    Additionally fix the Lua host build dependency as apk-tools uses during
    the build Lua to convert SCDOC manpages to apk-tools help messages.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    Link: https://github.com/openwrt/openwrt/pull/15543
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/system/apk/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
index e30bce9455..a372e7cc9c 100644
--- a/package/system/apk/Makefile
+++ b/package/system/apk/Makefile
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_INSTALL:=1
 
 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
-PKG_BUILD_DEPENDS:=lua/host
+HOST_BUILD_DEPENDS:=lua/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -52,7 +52,6 @@ MESON_HOST_VARS+=VERSION=$(PKG_VERSION)
 MESON_VARS+=VERSION=$(PKG_VERSION)
 
 MESON_HOST_ARGS += \
-	-Dhelp=disabled \
 	-Dcompressed-help=false \
 	-Ddocs=disabled \
 	-Dcrypto_backend=openssl \




More information about the lede-commits mailing list