[openwrt/openwrt] imagebuilder: fix addition of local packages

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6936deac67e5f0d950bcc26e56bc90b15b12db12

commit 6936deac67e5f0d950bcc26e56bc90b15b12db12
Author: Kuan-Yi Li <kyli at abysm.org>
AuthorDate: Fri Feb 21 05:26:15 2025 +0800

    imagebuilder: fix addition of local packages
    
    Since alpinelinux/apk-tools at 460d62ee743c, relative paths are no longer
    accepted in repositories file.
    
    Add local repository in APK command instead to fix this issue.
    
    Fixes: 83d2d21904e0 ("apk: update to Git HEAD (2025-02-08)")
    Fixes: https://github.com/openwrt/openwrt/issues/18032
    Signed-off-by: Kuan-Yi Li <kyli at abysm.org>
    Link: https://github.com/openwrt/openwrt/pull/18048
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/imagebuilder/Makefile       | 1 -
 target/imagebuilder/files/Makefile | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index afc97550c1..6fca91939f 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -49,7 +49,6 @@ ifneq ($(CONFIG_USE_APK),)
 	$(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories)
 	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories
   endif
-	echo "packages/packages.adb" >> $(PKG_BUILD_DIR)/repositories
 
 	$(INSTALL_DATA) ./files/README.apk.md $(PKG_BUILD_DIR)/packages/README.md
 else
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index b27021d600..d8c1c3c5e8 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -99,6 +99,7 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \
 export APK_KEYS:=$(TOPDIR)/keys
 APK:=$(call apk,$(TARGET_DIR)) \
 	--repositories-file $(TOPDIR)/repositories \
+	--repository $(PACKAGE_DIR)/packages.adb \
 	$(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \
 	--cache-dir $(DL_DIR)