diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | INSTALL | 10 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | package/targets.mak | 24 |
5 files changed, 36 insertions, 11 deletions
diff --git a/AUTHORS b/AUTHORS index 065b553..e05b68c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ Main author: Laurent Bercot <ska-skaware@skarnet.org> -Thanks to: +Contributors: Colin Booth <colin@heliocat.net> diff --git a/COPYING b/COPYING index 898f9cb..04c41fb 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2018-2020 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2018-2021 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 0bd6e14..b272f4b 100644 --- a/INSTALL +++ b/INSTALL @@ -6,11 +6,11 @@ Build Instructions - A POSIX compatible system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.9.2.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.6.0.0 or later: https://skarnet.org/software/execline/ - - s6 version 2.9.1.0 or later: https://skarnet.org/software/s6/ - - s6-rc version 0.5.1.2 or later: https://skarnet.org/software/s6-rc/ - - s6-linux-init version 1.0.4.0 or later: https://skarnet.org/software/s6-linux-init/ + - skalibs version 2.10.0.2 or later: https://skarnet.org/software/skalibs/ + - execline version 2.8.0.0 or later: https://skarnet.org/software/execline/ + - s6 version 2.10.0.2 or later: https://skarnet.org/software/s6/ + - s6-rc version 0.5.2.1 or later: https://skarnet.org/software/s6-rc/ + - s6-linux-init version 1.0.6.1 or later: https://skarnet.org/software/s6-linux-init/ * Standard usage diff --git a/configure b/configure index 449eabd..f8e1fc3 100755 --- a/configure +++ b/configure @@ -48,6 +48,7 @@ Optional features: --enable-nsss use the nsss library for user information [disabled] --enable-aliases-daemontools build emulation of daemontools programs [disabled] --enable-aliases-runit build emulation of runit programs [disabled] + --disable-aliases-symlinks do not create daemontools/runit multicall symlinks [enabled] EOF exit 0 @@ -164,6 +165,7 @@ vpathd='' build= adaemontools=false arunit=false +asymlinks=true for arg ; do case "$arg" in @@ -200,6 +202,8 @@ for arg ; do --disable-aliases-daemontools|--enable-aliases-daemontools=no) adaemontools=false ;; --enable-aliases-runit|--enable-aliases-runit=yes) arunit=true ;; --disable-aliases-runit|--enable-aliases-runit=no) arunit=false ;; + --enable-aliases-symlinks|--enable-aliases-symlinks=yes) asymlinks=true ;; + --disable-aliases-symlinks|--enable-aliases-symlinks=no) asymlinks=false ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; @@ -465,6 +469,11 @@ if $arunit ; then else echo "WRAP_RUNIT :=" fi +if $asymlinks ; then + echo "WRAP_SYMLINKS := 1" +else + echo "WRAP_SYMLINKS :=" +fi exec 1>&3 3>&- echo " ... done." 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 |