From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 20 May 2018 17:32:29 +0000 (+0200)
Subject: openwrt-keyring: rename from lede-keyring
X-Git-Tag: v18.06.0-rc1~176
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc6f1fd8febe0ceb3a261f21d4d2f8d51c2bc033;p=openwrt%2Fstaging%2Fxback.git

openwrt-keyring: rename from lede-keyring

Also let the new openwrt-keyring package provide lede-keyring for backwards
compatibility.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fd72e67ffe10a130ae4ee9620e7670d83c2538ce)
---

diff --git a/package/system/lede-keyring/Makefile b/package/system/lede-keyring/Makefile
deleted file mode 100644
index d0961b1626..0000000000
--- a/package/system/lede-keyring/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2016 LEDE project
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lede-keyring
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git
-PKG_SOURCE_DATE:=2017-01-20
-PKG_SOURCE_VERSION:=a50b7529880988ca96e72dede0279ff139a8ab1a
-PKG_MIRROR_HASH:=811ba79ba71925e949d2c690db7d7b031ac1dd965aa831ca9b6d9d70f5657254
-
-PKG_MAINTAINER:=John Crispin <john@phrozen.org>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lede-keyring
-  SECTION:=base
-  CATEGORY:=Base system
-  TITLE:=LEDE Developer Keyring
-  URL:=http://www.lede-project.org
-endef
-
-define Package/lede-keyring/description
-  The keyring of with the developer using and gpg public keys.
-endef
-
-Build/Compile=
-
-define Package/lede-keyring/install
-	$(INSTALL_DIR) $(1)/etc/opkg/keys/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/* $(1)/etc/opkg/keys/
-endef
-
-$(eval $(call BuildPackage,lede-keyring))
diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile
new file mode 100644
index 0000000000..185401f2fa
--- /dev/null
+++ b/package/system/openwrt-keyring/Makefile
@@ -0,0 +1,38 @@
+# Copyright (C) 2016 LEDE project
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openwrt-keyring
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git
+PKG_SOURCE_DATE:=2017-01-20
+PKG_SOURCE_VERSION:=a50b7529880988ca96e72dede0279ff139a8ab1a
+PKG_MIRROR_HASH:=811ba79ba71925e949d2c690db7d7b031ac1dd965aa831ca9b6d9d70f5657254
+
+PKG_MAINTAINER:=John Crispin <john@phrozen.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/openwrt-keyring
+  SECTION:=base
+  CATEGORY:=Base system
+  PROVIDES:=lede-keyring
+  TITLE:=OpenWrt Developer Keyring
+  URL:=https://openwrt.org/docs/guide-user/security/signatures
+endef
+
+define Package/openwrt-keyring/description
+  The keyring of with the developer using and gpg public keys.
+endef
+
+Build/Compile=
+
+define Package/openwrt-keyring/install
+	$(INSTALL_DIR) $(1)/etc/opkg/keys/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/* $(1)/etc/opkg/keys/
+endef
+
+$(eval $(call BuildPackage,openwrt-keyring))