[openwrt/openwrt] imagebuilder: fix APK package_depends support
LEDE Commits
lede-commits at lists.infradead.org
Wed Nov 20 00:49:25 PST 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/03eeeffbd62bbba201445e0b79bd3360c896a4c8
commit 03eeeffbd62bbba201445e0b79bd3360c896a4c8
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Tue Nov 19 23:38:02 2024 +0100
imagebuilder: fix APK package_depends support
Currently trying to use the 'package_depends' feature of ImageBuilder will
result in it trying to call OPKG:
make package_depends PACKAGE="usbutils"
OK: 26 MiB in 142 packages
bash: line 1: openwrt-imagebuilder-qualcommax-ipq807x.Linux-x86_64/staging_dir/host/bin/opkg: No such file or directory
make: *** [Makefile:363: package_depends] Error 127
It looks like a copy/paste error when APK support was being added, so lets
fix it by calling APK and its "info --depends" command.
Fixes: #16996
Fixes: d788ab376f85 ("build: add APK package build capabilities")
Link: https://github.com/openwrt/openwrt/pull/17022
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
target/imagebuilder/files/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 2c6e26e4ee..125cc798fc 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -363,7 +363,7 @@ endif
ifeq ($(CONFIG_USE_APK),)
@$(OPKG) depends -A $(PACKAGE)
else
- @$(OPKG) whatdepends -A $(PACKAGE)
+ @$(APK) info --depends $(PACKAGE)
endif
.SILENT: help info image manifest package_whatdepends package_depends
More information about the lede-commits
mailing list