imagebuilder: skip repository file when standalone

Standalone image builder doesn't have a repositories file as all
packages are included, which causes:

ERROR: failed to read repositories: PATH_TO_BUILDER/repositories: No such file or directory

The images are still built, so this is more of an informational error.

Pass related argument to apk only when CONFIG_IB_STANDALONE is not set.

Fixes: a8d17c21 ("imagebuilder: actually support IB from buildbot")
Signed-off-by: George Sapkin <george@sapk.in>
Link: https://github.com/openwrt/openwrt/pull/21658
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index a44eb8b988da93d4ccf12752601621ba55e4ab44..c9de9aee93aadc3107c426660293d6e85007e5b4 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -98,7 +98,7 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \
 
 export APK_KEYS:=$(TOPDIR)/keys
 APK:=$(call apk,$(TARGET_DIR)) \
-       --repositories-file $(TOPDIR)/repositories \
+       $(if $(CONFIG_IB_STANDALONE),,--repositories-file $(TOPDIR)/repositories) \
        --repository $(PACKAGE_DIR)/packages.adb \
        $(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \
        --cache-dir $(DL_DIR)