Save pending changes in 1.0.0.0 branch

5 files changed, 73 insertions, 21 deletions

diff --git a/package/deps-build b/package/deps-build
index 05d5af4..d63229b 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1 +1,3 @@
 /package/prog/skalibs
+/package/admin/execline
+/package/admin/s6
diff --git a/package/deps.mak b/package/deps.mak
index 95fbd4b..3aef281 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -2,17 +2,55 @@
 # This file has been generated by tools/gen-deps.sh
 #
 
-src/init/hpr.o src/init/hpr.lo: src/init/hpr.c
-src/init/s6-halt.o src/init/s6-halt.lo: src/init/s6-halt.c
-src/init/s6-linux-init-maker.o src/init/s6-linux-init-maker.lo: src/init/s6-linux-init-maker.c
-src/init/s6-poweroff.o src/init/s6-poweroff.lo: src/init/s6-poweroff.c
-src/init/s6-reboot.o src/init/s6-reboot.lo: src/init/s6-reboot.c
+src/include-local/initctl.h: src/include/s6-linux-init/config.h
+src/shutdown/hpr.h: src/include-local/initctl.h
+src/init/s6-linux-init-maker.o src/init/s6-linux-init-maker.lo: src/init/s6-linux-init-maker.c src/include-local/defaults.h src/include-local/initctl.h src/include/s6-linux-init/config.h
+src/init/s6-linux-init.o src/init/s6-linux-init.lo: src/init/s6-linux-init.c src/include-local/defaults.h src/include-local/initctl.h src/include/s6-linux-init/config.h
+src/lib/s6_linux_init_logouthook.o src/lib/s6_linux_init_logouthook.lo: src/lib/s6_linux_init_logouthook.c src/include-local/initctl.h
+src/logout-hook/s6-linux-init-logouthookd.o src/logout-hook/s6-linux-init-logouthookd.lo: src/logout-hook/s6-linux-init-logouthookd.c
+src/shutdown/hpr.o src/shutdown/hpr.lo: src/shutdown/hpr.c src/include-local/defaults.h src/shutdown/hpr.h
+src/shutdown/hpr_fmttime.o src/shutdown/hpr_fmttime.lo: src/shutdown/hpr_fmttime.c src/shutdown/hpr.h
+src/shutdown/hpr_shutdown.o src/shutdown/hpr_shutdown.lo: src/shutdown/hpr_shutdown.c src/shutdown/hpr.h
+src/shutdown/hpr_wall.o src/shutdown/hpr_wall.lo: src/shutdown/hpr_wall.c src/shutdown/hpr.h
+src/shutdown/hpr_wall_seconds.o src/shutdown/hpr_wall_seconds.lo: src/shutdown/hpr_wall_seconds.c src/shutdown/hpr.h
+src/shutdown/s6-linux-init-halt.o src/shutdown/s6-linux-init-halt.lo: src/shutdown/s6-linux-init-halt.c
+src/shutdown/s6-linux-init-poweroff.o src/shutdown/s6-linux-init-poweroff.lo: src/shutdown/s6-linux-init-poweroff.c
+src/shutdown/s6-linux-init-reboot.o src/shutdown/s6-linux-init-reboot.lo: src/shutdown/s6-linux-init-reboot.c
+src/shutdown/s6-linux-init-shutdown.o src/shutdown/s6-linux-init-shutdown.lo: src/shutdown/s6-linux-init-shutdown.c src/include-local/defaults.h src/shutdown/hpr.h src/include-local/initctl.h
+src/shutdown/s6-linux-init-shutdownd.o src/shutdown/s6-linux-init-shutdownd.lo: src/shutdown/s6-linux-init-shutdownd.c src/include-local/defaults.h src/shutdown/hpr.h src/include-local/initctl.h
+src/shutdown/s6-linux-init-single.o src/shutdown/s6-linux-init-single.lo: src/shutdown/s6-linux-init-single.c src/include-local/initctl.h
+src/shutdown/s6-linux-init-telinit.o src/shutdown/s6-linux-init-telinit.lo: src/shutdown/s6-linux-init-telinit.c src/include-local/defaults.h src/shutdown/hpr.h src/include-local/initctl.h
 
-s6-halt: EXTRA_LIBS :=
-s6-halt: src/init/s6-halt.o -lskarnet
+s6-linux-init: EXTRA_LIBS :=
+s6-linux-init: src/init/s6-linux-init.o -lskarnet
 s6-linux-init-maker: EXTRA_LIBS :=
 s6-linux-init-maker: src/init/s6-linux-init-maker.o -lskarnet
-s6-poweroff: EXTRA_LIBS :=
-s6-poweroff: src/init/s6-poweroff.o -lskarnet
-s6-reboot: EXTRA_LIBS :=
-s6-reboot: src/init/s6-reboot.o -lskarnet
+ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
+libs6_linux_init.a.xyzzy: src/lib/s6_linux_init_logouthook.o
+else
+libs6_linux_init.a.xyzzy: src/lib/s6_linux_init_logouthook.lo
+endif
+libs6_linux_init.so.xyzzy: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${TAINNOW_LIB}
+libs6_linux_init.so.xyzzy: src/lib/s6_linux_init_logouthook.lo
+s6-linux-init-logouthookd: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-logouthookd: src/logout-hook/s6-linux-init-logouthookd.o ${LIBUTMPS} -lskarnet
+ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
+libhpr.a.xyzzy: src/shutdown/hpr_fmttime.o src/shutdown/hpr_shutdown.o src/shutdown/hpr_wall.o src/shutdown/hpr_wall_seconds.o
+else
+libhpr.a.xyzzy: src/shutdown/hpr_fmttime.lo src/shutdown/hpr_shutdown.lo src/shutdown/hpr_wall.lo src/shutdown/hpr_wall_seconds.lo
+endif
+s6-linux-init-halt: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-halt: src/shutdown/s6-linux-init-halt.o libhpr.a.xyzzy ${LIBUTMPS} -lskarnet
+s6-linux-init-poweroff: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-poweroff: src/shutdown/s6-linux-init-poweroff.o libhpr.a.xyzzy ${LIBUTMPS} -lskarnet
+s6-linux-init-reboot: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-reboot: src/shutdown/s6-linux-init-reboot.o libhpr.a.xyzzy ${LIBUTMPS} -lskarnet
+s6-linux-init-shutdown: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-shutdown: src/shutdown/s6-linux-init-shutdown.o libhpr.a.xyzzy ${LIBUTMPS} -lskarnet
+s6-linux-init-shutdownd: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-linux-init-shutdownd: src/shutdown/s6-linux-init-shutdownd.o ${LIBUTMPS} -lskarnet
+s6-linux-init-single: EXTRA_LIBS :=
+s6-linux-init-single: src/shutdown/s6-linux-init-single.o -lskarnet
+s6-linux-init-telinit: EXTRA_LIBS :=
+s6-linux-init-telinit: src/shutdown/s6-linux-init-telinit.o libhpr.a.xyzzy -lskarnet
+INTERNAL_LIBS := libhpr.a.xyzzy
diff --git a/package/info b/package/info
index f7c3758..d58a5f1 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=0.4.0.0
+version=1.0.0.0
 category=admin
 package_macro_name=S6_LINUX_INIT
diff --git a/package/modes b/package/modes
index f2fafad..cf55736 100644
--- a/package/modes
+++ b/package/modes
@@ -1,4 +1,10 @@
-s6-linux-init-maker	0700
-s6-halt			0700
-s6-poweroff		0700
-s6-reboot		0700
+s6-linux-init-single		0700
+s6-linux-init-halt		0700
+s6-linux-init-poweroff		0700
+s6-linux-init-reboot		0700
+s6-linux-init-shutdown		0700
+s6-linux-init-shutdownd		0700
+s6-linux-init-logouthookd	0700
+s6-linux-init			0700
+s6-linux-init-telinit		0700
+s6-linux-init-maker		0700
diff --git a/package/targets.mak b/package/targets.mak
index 26ef489..1462ca6 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,7 +1,13 @@
 BIN_TARGETS := \
-s6-linux-init-maker \
-s6-halt \
-s6-poweroff \
-s6-reboot
+s6-linux-init-single \
+s6-linux-init-halt \
+s6-linux-init-poweroff \
+s6-linux-init-reboot \
+s6-linux-init-shutdown \
+s6-linux-init-shutdownd \
+s6-linux-init-logouthookd \
+s6-linux-init \
+s6-linux-init-telinit \
+s6-linux-init-maker
 
-LIBEXEC_TARGETS :=
+LIB_DEFS := S6_LINUX_INIT=s6_linux_init