From 1c666ca77c146316bc661cb391f7a8fde3d9505b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 14 Mar 2021 10:40:34 +0000 Subject: Add --disable-alias-symlinks option --- package/targets.mak | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/targets.mak b/package/targets.mak index 5767606..ce3d7b2 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -7,6 +7,10 @@ WRAP_ANY := ifdef WRAP_DAEMONTOOLS +ifdef WRAP_SYMLINKS + +WRAP_ANY := 1 + DAEMONTOOLS_TARGETS := \ envdir \ envuidgid \ @@ -26,18 +30,26 @@ svstat \ tai64n \ tai64nlocal +else + +DAEMONTOOLS_TARGETS := + +endif + install-bin: $(DAEMONTOOLS_TARGETS:%=$(DESTDIR)$(bindir)/%) ifneq ($(exthome),) global-links: $(DAEMONTOOLS_TARGETS:%=$(DESTDIR)$(sproot)/command/%) endif -WRAP_ANY := 1 - endif ifdef WRAP_RUNIT +ifdef WRAP_SYMLINKS + +WRAP_ANY := 1 + RUNIT_TARGETS := \ runit \ runit-init \ @@ -47,6 +59,12 @@ runsvdir \ svlogd \ utmpset +else + +RUNIT_TARGETS := + +endif + RUNIT_SPECIAL_TARGETS := chpst sv BIN_TARGETS += s6-frontend-alias-sv s6-frontend-alias-chpst @@ -56,8 +74,6 @@ ifneq ($(exthome),) global-links: $(RUNIT_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(RUNIT_SPECIAL_TARGETS:%=$(DESTDIR)$(sproot)/command/%) endif -WRAP_ANY := 1 - $(DESTDIR)$(bindir)/chpst: $(DESTDIR)$(bindir)/s6-frontend-alias-chpst exec $(INSTALL) -D -l s6-frontend-alias-chpst $@ $(DESTDIR)$(bindir)/sv: $(DESTDIR)$(bindir)/s6-frontend-alias-sv -- cgit 1.4.1