mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
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 <tjtncks@gmail.com>
This commit is contained in:
committed by
Alexandru Ardelean
parent
54791efcda
commit
cae6de76c2
@@ -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
|
||||
|
||||
@@ -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))
|
||||
+2
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user