hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-04 06:54:27 -05:00
Code Issues Projects Releases Wiki Activity

imagebuilder: actually support IB from buildbot

Browse Source 
ImageBuilder compiled by buildbot doesn't have any package in the
packages directory. Package needs to be downloaded instead.

This works by calling update to the package manage to download the
remove index and download the file.

Fix missing support for this with APK, by configuring the
--repositories-file option and calling the APK update.

Also move the apk add --initdb to package_index.

If CONFIG_SIGNATURE_CHECK is not enabled, the signature is not checked.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-10-24 20:36:43 +02:00
parent 1c211e7781
commit a8d17c21e4
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/imagebuilder/files/Makefile
View File

@ -95,8 +95,9 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \
--lists-dir $(LISTS_DIR) --lists-dir $(LISTS_DIR)
APK:=$(call apk,$(TARGET_DIR)) \ APK:=$(call apk,$(TARGET_DIR)) \
--cache-dir $(DL_DIR) \ --repositories-file $(TOPDIR)/repositories \
--allow-untrusted $(if $(CONFIG_SIGNATURE_CHECK),,--allow-untrusted) \
--cache-dir $(DL_DIR)
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
@ -177,7 +178,10 @@ ifeq ($(CONFIG_USE_APK),)
) >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null
$(OPKG) update >&2 || true $(OPKG) update >&2 || true
else else
(cd $(PACKAGE_DIR); $(APK) mkndx --output packages.adb *.apk) >&2 $(APK) add --initdb
(cd $(PACKAGE_DIR); $(APK) mkndx \
--allow-untrusted --output packages.adb *.apk) >/dev/null 2>/dev/null || true
$(APK) update >&2 || true
endif endif
package_reload: package_reload:
@ -220,7 +224,7 @@ ifeq ($(CONFIG_USE_APK),)
$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk)) $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
$(OPKG) install $(BUILD_PACKAGES) $(OPKG) install $(BUILD_PACKAGES)
else else
$(APK) add --initdb --no-scripts $(firstword $(wildcard $(LINUX_DIR)/libc-*.apk $(PACKAGE_DIR)/libc_*.apk)) $(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/libc-*.apk $(PACKAGE_DIR)/libc_*.apk))
$(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/kernel-*.apk $(PACKAGE_DIR)/kernel_*.apk)) $(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/kernel-*.apk $(PACKAGE_DIR)/kernel_*.apk))
$(APK) add --no-scripts $(BUILD_PACKAGES) $(APK) add --no-scripts $(BUILD_PACKAGES)
endif endif