diff options
| author | Petr Štetiar | 2024-05-23 10:24:11 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-06-11 21:58:14 +0000 |
| commit | 617431685eb080eac469019361bb894989c4f191 (patch) | |
| tree | 48cb5f4bf3f9a5ff5d5f065dc8a52f8218fb861a | |
| parent | 52e9431731fc4c0b6a2c2e2e76090a0641dc4334 (diff) | |
| download | openwrt-617431685eb080eac469019361bb894989c4f191.tar.gz | |
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@true.cz>
[ rework logic to be more self contained ]
Link: https://github.com/openwrt/openwrt/pull/15543
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rw-r--r-- | package/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |