RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

imagebuilder: init APK dirs every time 

The `--initdb` command creates basic folders required by APK,
previoiusly it would only run a single time when package_index is
actually called. Since the function isn't called if nothing changes,
`--initdb` doesn't initialize the rootfs again.

This commit moves it to package_reload, which runs every time.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2024-11-08 10:37:16 +01:00
parent 15b7994c01
commit 12a7307869
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/imagebuilder/files/Makefile
View File

@ -181,7 +181,6 @@ ifeq ($(CONFIG_USE_APK),)
) >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null
$(OPKG) update >&2 || true $(OPKG) update >&2 || true
else else
$(APK) add --initdb
(cd $(PACKAGE_DIR); $(APK) mkndx \ (cd $(PACKAGE_DIR); $(APK) mkndx \
$(if $(CONFIG_SIGNATURE_CHECK), --keys-dir $(APK_KEYS) --sign $(BUILD_KEY_APK_SEC)) \ $(if $(CONFIG_SIGNATURE_CHECK), --keys-dir $(APK_KEYS) --sign $(BUILD_KEY_APK_SEC)) \
--allow-untrusted --output packages.adb *.apk) >/dev/null 2>/dev/null || true --allow-untrusted --output packages.adb *.apk) >/dev/null 2>/dev/null || true
@ -200,6 +199,7 @@ ifeq ($(CONFIG_USE_APK),)
$(OPKG) update >&2 || true; \ $(OPKG) update >&2 || true; \
fi fi
else else
$(APK) add --initdb
if [ -d "$(PACKAGE_DIR)" ] && ( \ if [ -d "$(PACKAGE_DIR)" ] && ( \
[ ! -f "$(PACKAGE_DIR)/packages.adb" ] || \ [ ! -f "$(PACKAGE_DIR)/packages.adb" ] || \
[ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/packages.adb`" ] ); then \ [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/packages.adb`" ] ); then \