From 27c76121d8cf6d78bbe8ce163cb02fb60baaa61e Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 24 Oct 2024 20:29:52 +0200 Subject: [PATCH] imagebuilder: copy apk keys with CONFIG_SIGNATURE_CHECK With CONFIG_SIGNATURE_CHECK enabled, copy keys following OPKG pattern. Signed-off-by: Christian Marangi --- target/imagebuilder/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index ecc791b8e9..d2c125ccf2 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -82,13 +82,16 @@ else -exec $(CP) -t $(IB_LDIR)/ {} + endif -ifneq ($(CONFIG_USE_APK),y) ifneq ($(CONFIG_SIGNATURE_CHECK),) +ifneq ($(CONFIG_USE_APK),y) echo '' >> $(PKG_BUILD_DIR)/repositories.conf echo 'option check_signature' >> $(PKG_BUILD_DIR)/repositories.conf $(INSTALL_DIR) $(PKG_BUILD_DIR)/keys $(CP) -L $(STAGING_DIR_ROOT)/etc/opkg/keys/ $(PKG_BUILD_DIR)/ $(CP) -L $(STAGING_DIR_ROOT)/usr/sbin/opkg-key $(PKG_BUILD_DIR)/scripts/ +else + $(INSTALL_DIR) $(PKG_BUILD_DIR)/keys + $(CP) -L $(STAGING_DIR_ROOT)/etc/apk/keys/ $(PKG_BUILD_DIR)/ endif endif