[openwrt/openwrt] build: package: fix missing host apk dependency

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


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

commit 617431685eb080eac469019361bb894989c4f191
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu May 23 10:24:11 2024 +0000

    build: package: fix missing host apk dependency
    
    Currently the build with USE_APK=y fails in package/libs/toolchain:
    
     staging_dir/host/bin/fakeroot: line 182: staging_dir/host/bin/apk: No such file or directory
     make[2]: *** [Makefile:758: bin/targets/mediatek/filogic/packages/libgcc1-13.2.0-r4.apk] Error 127
    
    as commit d788ab376f ("build: add APK package build capabilities") added
    dependency on apk in packaging step, but there is no host build
    dependency defined, thus apk binary is missing when libgcc1 apk package is being
    created. So lets fix it by adding explicit apk/host dependency to all
    targets in the subdirectories.
    
    Fixes: d788ab376f ("build: add APK package build capabilities")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    [ rework logic to be more self contained ]
    Link: https://github.com/openwrt/openwrt/pull/15543
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/Makefile b/package/Makefile
index eb7cfcf962..9e3bb52b65 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -81,7 +81,7 @@ endif
 ifndef SDK
   $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
 ifneq ($(CONFIG_USE_APK),)
-  $(curdir)/compile: $(curdir)/system/apk/host/compile $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
+  $(curdir)//compile += $(curdir)/system/apk/host/compile $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
 else
   $(curdir)/compile: $(curdir)/system/opkg/host/compile
 endif




More information about the lede-commits mailing list