From a54b9570ad6abc0b3e1079e881d1dbe9a475e33d Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 29 Apr 2021 23:09:22 +0200 Subject: [PATCH] attendedsysupgrade-common: update to 2021 * Use $(COMMITCOUNT) * Use SPDX * Use CA (ucert) public key * Update repo link * Update maintainer email * Format description Signed-off-by: Paul Spooren --- utils/attendedsysupgrade-common/Makefile | 32 +++++++++---------- .../files/86241a707a30cb7f | 2 ++ .../files/c06d891233ba699 | 2 -- 3 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 utils/attendedsysupgrade-common/files/86241a707a30cb7f delete mode 100644 utils/attendedsysupgrade-common/files/c06d891233ba699 diff --git a/utils/attendedsysupgrade-common/Makefile b/utils/attendedsysupgrade-common/Makefile index 1af7779fc0..4408b81d4c 100644 --- a/utils/attendedsysupgrade-common/Makefile +++ b/utils/attendedsysupgrade-common/Makefile @@ -1,12 +1,9 @@ -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# SPDX-License-Identifier: GPL-2.0 include $(TOPDIR)/rules.mk PKG_NAME:=attendedsysupgrade-common -PKG_VERSION:=0.2 -PKG_RELEASE:=1 +PKG_VERSION:=$(COMMITCOUNT) PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk @@ -15,7 +12,7 @@ define Package/attendedsysupgrade-common SECTION:=utils CATEGORY:=Base system TITLE:=Common files neede by attendedsysupgrade packages - MAINTAINER:=Paul Spooren + MAINTAINER:=Paul Spooren DEPENDS:=+rpcd +rpcd-mod-rpcsys PKGARCH:=all endef @@ -27,20 +24,21 @@ define Package/attendedsysupgrade-common/description UCI options: - attendedsysupgrade.server.url - URL of compatible upgrade server [1] + * attendedsysupgrade.server.url + URL of compatible upgrade server [1] - attendedsysupgrade.client.upgrade_packages - Client should request image also if no new release but new packages upgrade are available. + * attendedsysupgrade.client.upgrade_packages + Client should request image also if no new release but new packages + upgrade are available. - attendedsysupgrade.client.advanced_mode - Offer advanced options like editing packages before request and show additional information. + * attendedsysupgrade.client.advanced_mode + Offer advanced options like editing packages before request and show + additional information. - attendedsysupgrade.client.auto_search - Tells the client to automattically search for upgrades - This can be done when opening luci or login in to console - depends on client. + * attendedsysupgrade.client.auto_search + Tells the client to automattically search for upgrades - [1]: https://github.com/aparcar/gsoc17-attended-sysupgrade + [1]: https://github.com/aparcar/asu endef define Build/Compile @@ -54,7 +52,7 @@ define Package/attendedsysupgrade-common/install $(INSTALL_BIN) ./files/attendedsysupgrade.defaults $(1)/etc/uci-defaults/attendedsysupgrade $(INSTALL_DIR) $(1)/etc/opkg/keys/ - $(INSTALL_BIN) ./files/c06d891233ba699 $(1)/etc/opkg/keys/c06d891233ba699 + $(INSTALL_BIN) ./files/86241a707a30cb7f $(1)/etc/opkg/keys/86241a707a30cb7f endef $(eval $(call BuildPackage,attendedsysupgrade-common)) diff --git a/utils/attendedsysupgrade-common/files/86241a707a30cb7f b/utils/attendedsysupgrade-common/files/86241a707a30cb7f new file mode 100644 index 0000000000..8007327141 --- /dev/null +++ b/utils/attendedsysupgrade-common/files/86241a707a30cb7f @@ -0,0 +1,2 @@ +untrusted comment: ASU CA pubkey +RWSGJBpwejDLf4OApA5SOavh0GBlBFY9FhqxnivUQHpi0/t0QRI98LPW diff --git a/utils/attendedsysupgrade-common/files/c06d891233ba699 b/utils/attendedsysupgrade-common/files/c06d891233ba699 deleted file mode 100644 index 94edfd8e12..0000000000 --- a/utils/attendedsysupgrade-common/files/c06d891233ba699 +++ /dev/null @@ -1,2 +0,0 @@ -untrusted comment: public key c06d891233ba699 -RWQMBtiRIzummeTc81jtKdJ3XwnaZGtHLRwjls0ovGsKoTnTmS7fj4Na