From: Petr Štetiar Date: Mon, 4 Nov 2024 09:02:19 +0000 (+0000) Subject: Revert "openwrt-keyring: fix missing 24.10 usign key by installing it" X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=118c657bd160fb68c29cade49e726128b1c0fa8b;p=openwrt%2Fstaging%2Fwigyori.git 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 Link: https://github.com/openwrt/openwrt/pull/16852 Signed-off-by: Robert Marko --- 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