Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imagebuilder: fix addition of local packages

Browse Source 
Since alpinelinux/apk-tools@460d62ee74, 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@abysm.org>
Link: https://github.com/openwrt/openwrt/pull/18048
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Kuan-Yi Li 2025-02-21 05:26:15 +08:00 committed by Robert Marko
parent 70586f574d
commit 6936deac67
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/imagebuilder/Makefile
View File

@ -49,7 +49,6 @@ ifneq ($(CONFIG_USE_APK),)
$(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories) $(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories)
$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories
endif endif
echo "packages/packages.adb" >> $(PKG_BUILD_DIR)/repositories
$(INSTALL_DATA) ./files/README.apk.md $(PKG_BUILD_DIR)/packages/README.md $(INSTALL_DATA) ./files/README.apk.md $(PKG_BUILD_DIR)/packages/README.md
else else

1
target/imagebuilder/files/Makefile
View File

@ -99,6 +99,7 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \
export APK_KEYS:=$(TOPDIR)/keys export APK_KEYS:=$(TOPDIR)/keys
APK:=$(call apk,$(TARGET_DIR)) \ APK:=$(call apk,$(TARGET_DIR)) \
--repositories-file $(TOPDIR)/repositories \ --repositories-file $(TOPDIR)/repositories \
--repository $(PACKAGE_DIR)/packages.adb \
$(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \ $(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \
--cache-dir $(DL_DIR) --cache-dir $(DL_DIR)