summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2024-10-24 20:29:52 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2024-10-29 00:07:51 +0100
commit27c76121d8cf6d78bbe8ce163cb02fb60baaa61e (patch)
tree3757a9e8e54bf442061802bcc5b94a89fe673791
parent23e27d21d532ffd3535810a6c8da2c70354bf78b (diff)
downloadopenwrt-27c76121d8cf6d78bbe8ce163cb02fb60baaa61e.tar.gz
openwrt-27c76121d8cf6d78bbe8ce163cb02fb60baaa61e.tar.bz2
openwrt-27c76121d8cf6d78bbe8ce163cb02fb60baaa61e.zip
imagebuilder: copy apk keys with CONFIG_SIGNATURE_CHECK
With CONFIG_SIGNATURE_CHECK enabled, copy keys following OPKG pattern. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-rw-r--r--target/imagebuilder/Makefile5
1 files changed, 4 insertions, 1 deletions
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