Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imagebuilder: fix multiple issue with manifest and sign keys handling

Browse source 
Fix multiple issue with manifest handling where APK was hardcoded
and fix a logic error where (TODO) APK _check_keys was called for the
OPKG codepath instead of correctly calling for the APK codepath.

Fixes: d788ab376f ("build: add APK package build capabilities")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-05-19 14:58:11 +02:00
parent 65c1f0d433
commit 5d37d8dc82
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/imagebuilder/files/Makefile
View file

@ -159,7 +159,11 @@ _call_manifest: FORCE
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR) mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
$(MAKE) package_reload >/dev/null $(MAKE) package_reload >/dev/null
$(MAKE) package_install >/dev/null $(MAKE) package_install >/dev/null
ifeq ($(CONFIG_USE_APK),)
$(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi)
else
$(APK) list --quiet --manifest --no-network $(APK) list --quiet --manifest --no-network
endif
package_index: FORCE package_index: FORCE
@echo >&2 @echo >&2
@ -202,7 +206,11 @@ endif
package_list: FORCE package_list: FORCE
@$(MAKE) -s package_reload @$(MAKE) -s package_reload
ifeq ($(CONFIG_USE_APK),)
@$(OPKG) list --size 2>/dev/null
else
@$(APK) list --size 2>/dev/null @$(APK) list --size 2>/dev/null
endif
package_install: FORCE package_install: FORCE
@echo @echo
@ -277,8 +285,6 @@ endif
_check_keys: FORCE _check_keys: FORCE
ifeq ($(CONFIG_USE_APK),) ifeq ($(CONFIG_USE_APK),)
# TODO
else
ifneq ($(CONFIG_SIGNATURE_CHECK),) ifneq ($(CONFIG_SIGNATURE_CHECK),)
@if [ ! -s $(BUILD_KEY) -o ! -s $(BUILD_KEY).pub ]; then \ @if [ ! -s $(BUILD_KEY) -o ! -s $(BUILD_KEY).pub ]; then \
echo Generate local signing keys... >&2; \ echo Generate local signing keys... >&2; \
@ -294,6 +300,8 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),)
-s $(BUILD_KEY); \ -s $(BUILD_KEY); \
fi fi
endif endif
else
# TODO
endif endif
image: image: