[openwrt/openwrt] sdk: fix APK key creation

LEDE Commits lede-commits at lists.infradead.org
Fri Aug 9 06:04:22 PDT 2024


aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/44b6df31841200200e374086a44e37c56621741f

commit 44b6df31841200200e374086a44e37c56621741f
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Thu Aug 8 17:31:18 2024 +0200

    sdk: fix APK key creation
    
    The keys are created differently compared to the old OPKG keys. Instead
    of being part of base-files/configure, they are created as a Makefile
    requirement of `package/compile`, which is a cleaner solution.
    
    This requirement would only be added to non SDK environments, however
    APK always requires keys to be available. Add an `else` case for the SDK
    and create keys.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 package/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/Makefile b/package/Makefile
index 9e3bb52b65..9de36b13c9 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -85,6 +85,10 @@ ifneq ($(CONFIG_USE_APK),)
 else
   $(curdir)/compile: $(curdir)/system/opkg/host/compile
 endif
+else
+ifneq ($(CONFIG_USE_APK),)
+  $(curdir)/compile: $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
+endif
 endif
 
 $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(curdir)/merge-index




More information about the lede-commits mailing list