acme: make 'acme' keyword actually virtual

before acme is an empty package that depend either acme-acmesh or uacme.
but this boolean logic in depend ignored by apk itself.
let's make a virtual keyword
witch both acme.sh and uacme provides.
acme.sh is explicit default.

Signed-off-by: Seo Suchan <redacted>

diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile
index 7cb5ba4ee2a36b046f4b7ffc7a46bc0f3b3e9731..c898bed2a539b2cc7ac13c39cf27d31f6d386673 100644 (file)
--- a/net/acme-acmesh/Makefile
+++ b/net/acme-acmesh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
 PKG_VERSION:=3.1.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
@@ -29,7 +29,8 @@ define Package/acme-acmesh
   TITLE:=ACME client acme.sh wrapper script
   URL:=https://acme.sh
   PKGARCH:=all
-  PROVIDES:=acme-client
+  PROVIDES:=@acme
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/acme-acmesh/description

diff --git a/net/acme/Makefile b/net/acme/Makefile
deleted file mode 100644 (file)
index afb5146..0000000
--- a/net/acme/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2016 Toke Høiland-Jørgensen
-#
-# This is free software, licensed under the GNU General Public License v3 or
-# later.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=acme
-PKG_VERSION:=4.0.1
-
-PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-PKG_LICENSE:=GPL-3.0-only
-PKG_LICENSE_FILES:=LICENSE.md
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/acme
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+!PACKAGE_uacme:acme-acmesh
-  TITLE:=Virtual package for any acme clients, default to acme-acmesh
-  PKGARCH:=all
-endef
-
-define Package/acme/description
-Shorthand package for proper acme backend, default to acme.sh and support uacme
-endef
-
-define Package/acme/install
-       :
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-$(eval $(call BuildPackage,acme))

diff --git a/net/uacme/Makefile b/net/uacme/Makefile
index 96653d969c56507b81266683dd893b33a59f6556..e7fa87647de4281e3f7618e6496426645454d408 100644 (file)
--- a/net/uacme/Makefile
+++ b/net/uacme/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uacme
 PKG_VERSION:=1.8.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)?
@@ -49,6 +49,7 @@ define Package/uacme
   DEPENDS:=+libcurl +LIBCURL_WOLFSSL:libmbedtls +acme-common
   TITLE:=lightweight client for ACMEv2
   Menu:=1
+  PROVIDES:=@acme
 endef
 
 define Package/uacme-ualpn