[openwrt/openwrt] openwrt-keyring: fix missing 24.10 usign key by installing it

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 4 01:27:48 PST 2024


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/92fd12e7fd90ab2dc44b70300eb05c9da4f1f698

commit 92fd12e7fd90ab2dc44b70300eb05c9da4f1f698
Author: Kuan-Yi Li <kyli at abysm.org>
AuthorDate: Sun Nov 3 04:11:36 2024 +0800

    openwrt-keyring: fix missing 24.10 usign key by installing it
    
    @KA2107 reported that opkg is not able to verify the artifact signatures
    produced by buildbot using the usign 24.10 release keys. So lets fix it
    by actually adding the 24.10 usign key with d310c6f2833e97f7 fingerprint
    into the openwrt-keyring package.
    
    Fixes: #16850
    Reported-by: @KA2107
    Fixes: a535cfc09e1c ("openwrt-keyring: add OpenWrt 24.10 release build usign key")
    References: 2d03f27f0f07 ("openwrt-keyring: make opkg use 22.03 usign key")
    Signed-off-by: Kuan-Yi Li <kyli at abysm.org>
    Signed-off-by: Petr Štetiar <ynezz at true.cz> [commit description]
---
 package/system/openwrt-keyring/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile
index 029463817b..6c2fa3d108 100644
--- a/package/system/openwrt-keyring/Makefile
+++ b/package/system/openwrt-keyring/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openwrt-keyring
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git
@@ -38,8 +38,8 @@ endef
 else
 define Package/openwrt-keyring/install
 	$(INSTALL_DIR) $(1)/etc/opkg/keys/
-	# Public usign key for unattended snapshot builds
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/b5043e70f9a75cde $(1)/etc/opkg/keys/
+	# Public usign key for 24.10 release builds
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/d310c6f2833e97f7 $(1)/etc/opkg/keys/
 endef
 endif
 




More information about the lede-commits mailing list