From 3b56d41ef579c18feafbf47d170a6ea4375beb6f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 4 Nov 2025 22:23:28 +0000 Subject: Lots of work done, doesn't build yet, next commit will - alias subsystem moved to s6 - config subsystem deleted - new helpers subsystem, with a s6-frontend-helper-kill program - new s6f_equote function, to execline-quote an argv - started the adaptation to the new s6-rc functions, in progress --- package/targets.mak | 90 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 88 deletions(-) (limited to 'package/targets.mak') diff --git a/package/targets.mak b/package/targets.mak index 2cdb392..13bab6f 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -2,92 +2,6 @@ BIN_TARGETS := \ s6 \ s6-frontend -LIBEXEC_TARGETS := +LIBEXEC_TARGETS := \ +s6-frontend-helper-kill \ -WRAP_ANY := - -ifdef WRAP_DAEMONTOOLS - -WRAP_ANY := 1 - -ifdef WRAP_SYMLINKS - -DAEMONTOOLS_TARGETS := \ -envdir \ -envuidgid \ -fghack \ -multilog \ -pgrphack \ -readproctitle \ -setlock \ -setuidgid \ -softlimit \ -supervise \ -svc \ -svok \ -svscan \ -svscanboot \ -svstat \ -tai64n \ -tai64nlocal - -else - -DAEMONTOOLS_TARGETS := - -endif - -install-bin: $(DAEMONTOOLS_TARGETS:%=$(DESTDIR)$(bindir)/%) - -ifneq ($(exthome),) -global-links: $(DAEMONTOOLS_TARGETS:%=$(DESTDIR)$(sproot)/command/%) -endif - -endif - -ifdef WRAP_RUNIT - -WRAP_ANY := 1 - -ifdef WRAP_SYMLINKS - -RUNIT_TARGETS := \ -runit \ -runit-init \ -runsv \ -runsvchdir \ -runsvdir \ -svlogd \ -utmpset -RUNIT_SPECIAL_TARGETS := chpst sv - -else - -RUNIT_TARGETS := -RUNIT_SPECIAL_TARGETS := - -endif - -BIN_TARGETS += s6-frontend-alias-sv s6-frontend-alias-chpst - -install-bin: $(RUNIT_TARGETS:%=$(DESTDIR)$(bindir)/%) $(RUNIT_SPECIAL_TARGETS:%=$(DESTDIR)$(bindir)/%) - -ifneq ($(exthome),) -global-links: $(RUNIT_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(RUNIT_SPECIAL_TARGETS:%=$(DESTDIR)$(sproot)/command/%) -endif - -$(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 - exec $(INSTALL) -D -l s6-frontend-alias-sv $@ - -endif - -ifdef WRAP_ANY - -BIN_TARGETS += s6-frontend-alias - -$(DAEMONTOOLS_TARGETS:%=$(DESTDIR)$(bindir)/%) $(RUNIT_TARGETS:%=$(DESTDIR)$(bindir)/%): $(DESTDIR)$(bindir)/s6-frontend-alias - exec $(INSTALL) -D -l s6-frontend-alias $@ - -endif -- cgit v1.3.1