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

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 25 03:21:05 PST 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/118c657bd160fb68c29cade49e726128b1c0fa8b

commit 118c657bd160fb68c29cade49e726128b1c0fa8b
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Mon Nov 4 09:02:19 2024 +0000

    Revert "openwrt-keyring: fix missing 24.10 usign key by installing it"
    
    This reverts commit 37784c48e93c663dafc99454c24bebf4e258556f as the
    preference is to have single explicit key for each release/branch.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    Link: https://github.com/openwrt/openwrt/pull/16852
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/system/openwrt-keyring/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile
index e499fc0beb..029463817b 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:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git
@@ -40,8 +40,6 @@ 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