From: Paul Spooren <mail@aparcar.org>
Date: Thu, 8 Aug 2024 15:31:18 +0000 (+0200)
Subject: sdk: fix APK key creation
X-Git-Tag: v24.10.0-rc1~1052
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=44b6df31841200200e374086a44e37c56621741f;p=openwrt%2Fopenwrt.git

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@aparcar.org>
---

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