diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/deps-build | 4 | ||||
| -rw-r--r-- | package/deps.mak | 58 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | package/modes | 13 | ||||
| -rw-r--r-- | package/targets.mak | 26 |
5 files changed, 80 insertions, 23 deletions
diff --git a/package/deps-build b/package/deps-build index 05d5af4..f622849 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1 +1,5 @@ /package/prog/skalibs +/package/admin/nsss $usensss +/package/admin/utmps $utmps +/package/admin/execline +/package/admin/s6 diff --git a/package/deps.mak b/package/deps.mak index 95fbd4b..486a8af 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -2,17 +2,49 @@ # 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-telinit.o src/init/s6-linux-init-telinit.lo: src/init/s6-linux-init-telinit.c 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/include/s6-linux-init/s6-linux-init.h +src/misc/s6-linux-init-echo.o src/misc/s6-linux-init-echo.lo: src/misc/s6-linux-init-echo.c +src/misc/s6-linux-init-logouthookd.o src/misc/s6-linux-init-logouthookd.lo: src/misc/s6-linux-init-logouthookd.c +src/misc/s6-linux-init-umountall.o src/misc/s6-linux-init-umountall.lo: src/misc/s6-linux-init-umountall.c +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/s6-linux-init-hpr.o src/shutdown/s6-linux-init-hpr.lo: src/shutdown/s6-linux-init-hpr.c src/include-local/defaults.h src/shutdown/hpr.h +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/include/s6-linux-init/config.h -s6-halt: EXTRA_LIBS := -s6-halt: src/init/s6-halt.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 +s6-linux-init: EXTRA_LIBS := +s6-linux-init: src/init/s6-linux-init.o -lskarnet +s6-linux-init-maker: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} +s6-linux-init-maker: src/init/s6-linux-init-maker.o ${LIBNSSS} -lskarnet +s6-linux-init-telinit: EXTRA_LIBS := +s6-linux-init-telinit: src/init/s6-linux-init-telinit.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-echo: EXTRA_LIBS := +s6-linux-init-echo: src/misc/s6-linux-init-echo.o -lskarnet +s6-linux-init-logouthookd: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} +s6-linux-init-logouthookd: src/misc/s6-linux-init-logouthookd.o ${LIBUTMPS} -lskarnet +s6-linux-init-umountall: EXTRA_LIBS := +s6-linux-init-umountall: src/misc/s6-linux-init-umountall.o -lskarnet +ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) +libhpr.a.xyzzy: src/shutdown/hpr_shutdown.o src/shutdown/hpr_wall.o +else +libhpr.a.xyzzy: src/shutdown/hpr_shutdown.lo src/shutdown/hpr_wall.lo +endif +s6-linux-init-hpr: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} +s6-linux-init-hpr: src/shutdown/s6-linux-init-hpr.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 -ls6 ${LIBUTMPS} -lskarnet +INTERNAL_LIBS := libhpr.a.xyzzy diff --git a/package/info b/package/info index 8a7b49e..d58a5f1 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-init -version=0.4.0.1 +version=1.0.0.0 category=admin package_macro_name=S6_LINUX_INIT diff --git a/package/modes b/package/modes index f2fafad..ab52a84 100644 --- a/package/modes +++ b/package/modes @@ -1,4 +1,9 @@ -s6-linux-init-maker 0700 -s6-halt 0700 -s6-poweroff 0700 -s6-reboot 0700 +s6-linux-init 0700 +s6-linux-init-hpr 0750 +s6-linux-init-shutdown 0755 +s6-linux-init-shutdownd 0700 +s6-linux-init-telinit 0750 +s6-linux-init-logouthookd 0700 +s6-linux-init-echo 0755 +s6-linux-init-umountall 0750 +s6-linux-init-maker 0700 diff --git a/package/targets.mak b/package/targets.mak index 26ef489..412e9e3 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -1,7 +1,23 @@ BIN_TARGETS := \ -s6-linux-init-maker \ -s6-halt \ -s6-poweroff \ -s6-reboot +s6-linux-init \ +s6-linux-init-hpr \ +s6-linux-init-shutdown \ +s6-linux-init-shutdownd \ +s6-linux-init-telinit \ +s6-linux-init-logouthookd \ +s6-linux-init-echo \ +s6-linux-init-umountall \ +s6-linux-init-maker -LIBEXEC_TARGETS := +LIB_DEFS := S6_LINUX_INIT=s6_linux_init + +SKELFILES := $(wildcard skel/*) + +$(DESTDIR)$(skeldir)/%: skel/% + ./tools/install.sh -D -m 0755 $< $@ + +install-skel: $(SKELFILES:skel/%=$(DESTDIR)$(skeldir)/%) + +.PHONY: install-skel + +install: install-skel |