summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-02-10 10:29:25 +0000
committerLaurent Bercot <ska@appnovation.com>2023-02-10 10:29:25 +0000
commitebd7a0c2fea984d377f11062bc8f56f777a9a572 (patch)
treefb06acdc2fcb0efd369921baa38fa32f50286b72
parent7d03ae8023f4eb754406772f3252ebaf6528a4eb (diff)
downloads6-linux-init-ebd7a0c2fea984d377f11062bc8f56f777a9a572.tar.xz
Fix build
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--package/deps.mak4
-rw-r--r--src/init/s6-linux-init-maker.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/package/deps.mak b/package/deps.mak
index 1f0bd20..4d1a9d5 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -18,7 +18,7 @@ src/shutdown/hpr_wall.o src/shutdown/hpr_wall.lo: src/shutdown/hpr_wall.c src/sh
src/shutdown/hpr_wallv.o src/shutdown/hpr_wallv.lo: src/shutdown/hpr_wallv.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
+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/include-local/initctl.h src/include/s6-linux-init/config.h
s6-linux-init: EXTRA_LIBS := -lskarnet
s6-linux-init: src/init/s6-linux-init.o
@@ -51,5 +51,5 @@ s6-linux-init-hpr: src/shutdown/s6-linux-init-hpr.o libhpr.a.xyzzy ${LIBUTMPS}
s6-linux-init-shutdown: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
s6-linux-init-shutdown: src/shutdown/s6-linux-init-shutdown.o libhpr.a.xyzzy ${LIBUTMPS}
s6-linux-init-shutdownd: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
-s6-linux-init-shutdownd: src/shutdown/s6-linux-init-shutdownd.o ${LIBUTMPS}
+s6-linux-init-shutdownd: src/shutdown/s6-linux-init-shutdownd.o
INTERNAL_LIBS := libhpr.a.xyzzy
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index bc094e3..b5edaaf 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -27,9 +27,6 @@
#include "initctl.h"
#define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -f skeldir ] [ -C ] [ -B ] dir"
-# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNf:CBS"
-#endif
-
#define dieusage() strerr_dieusage(100, USAGE)
#define dienomem() strerr_diefu1sys(111, "stralloc_catb") ;