[Astlinux-commits] SF.net SVN: astlinux:[8095] branches/1.0/package/acme/acme.mk

[<abe...@us...>]

Revision: 8095
          http://sourceforge.net/p/astlinux/code/8095
Author:   abelbeck
Date:     2017-01-14 22:29:31 +0000 (Sat, 14 Jan 2017)
Log Message:
-----------
acme, build system, add /etc/acme symlink and keep dns_nsupdate.sh if BIND is enabled

Modified Paths:
--------------
    branches/1.0/package/acme/acme.mk

Modified: branches/1.0/package/acme/acme.mk
===================================================================
--- branches/1.0/package/acme/acme.mk	2017-01-14 19:46:18 UTC (rev 8094)
+++ branches/1.0/package/acme/acme.mk	2017-01-14 22:29:31 UTC (rev 8095)
@@ -8,6 +8,8 @@
 ACME_SOURCE = acme.sh-$(ACME_VERSION).tar.gz
 ACME_SITE = http://files.astlinux-project.org
 
+ACME_REMOVE_TARGET_DNSAPI = dns_myapi.sh $(if $(BR2_PACKAGE_BIND),,dns_nsupdate.sh) README.md
+
 ##
 ## curl -L -o dl/acme.sh-2.6.5-2017-01-13.tar.gz https://github.com/Neilpang/acme.sh/archive/master.tar.gz
 ## ./scripts/upload-dl-pair dl/acme.sh-2.6.5-2017-01-13.tar.gz
@@ -18,14 +20,16 @@
 	$(INSTALL) -D -m 0755 package/acme/astlinux.sh $(TARGET_DIR)/stat/etc/acme/deploy/astlinux.sh
 	$(INSTALL) -D -m 0755 $(@D)/acme.sh $(TARGET_DIR)/stat/etc/acme/acme.sh
 	cp -a $(@D)/dnsapi $(TARGET_DIR)/stat/etc/acme/
+	ln -s /mnt/kd/acme $(TARGET_DIR)/etc/acme
+	# Remove non-required dnsapi files
+	rm -f $(addprefix $(TARGET_DIR)/stat/etc/acme/dnsapi/, $(ACME_REMOVE_TARGET_DNSAPI))
+	# Make sure the dnsapi scripts are executable
 	find $(TARGET_DIR)/stat/etc/acme/dnsapi/ -name '*.sh' -print0 | xargs -0 chmod 755
-	# We don't enable BIND, so no nsupdate, and remove sample
-	rm -f $(TARGET_DIR)/stat/etc/acme/dnsapi/dns_nsupdate.sh
-	rm -f $(TARGET_DIR)/stat/etc/acme/dnsapi/dns_myapi.sh
 endef
 
 define ACME_UNINSTALL_TARGET_CMDS
 	rm -f  $(TARGET_DIR)/usr/sbin/acme-client
+	rm -f  $(TARGET_DIR)/etc/acme
 	rm -rf $(TARGET_DIR)/stat/etc/acme
 endef
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.