From 3f6b6d787b4271e84315c46511db5f5778f6ee5d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 16 Aug 2015 20:42:56 +0000
Subject:  Safer version of pipelines, with an auto-refilling fdholder

---
 package/deps.mak    |  9 ++++++---
 package/modes       | 13 +++++++------
 package/targets.mak |  3 ++-
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'package')

diff --git a/package/deps.mak b/package/deps.mak
index a2a4dc4..b4edef6 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -12,9 +12,10 @@ src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_sizes.lo: src/libs6rc/
 src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_db_read_uint32.lo: src/libs6rc/s6rc_db_read_uint32.c src/include/s6-rc/s6rc-db.h
 src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_graph_closure.lo: src/libs6rc/s6rc_graph_closure.c src/include/s6-rc/s6rc-db.h src/include/s6-rc/s6rc-utils.h
 src/s6-rc/s6-rc-compile.o src/s6-rc/s6-rc-compile.lo: src/s6-rc/s6-rc-compile.c src/include/s6-rc/s6rc.h
-src/s6-rc/s6-rc-db.o src/s6-rc/s6-rc-db.lo: src/s6-rc/s6-rc-db.c src/include/s6-rc/s6rc.h
+src/s6-rc/s6-rc-db.o src/s6-rc/s6-rc-db.lo: src/s6-rc/s6-rc-db.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-dryrun.o src/s6-rc/s6-rc-dryrun.lo: src/s6-rc/s6-rc-dryrun.c
-src/s6-rc/s6-rc-init.o src/s6-rc/s6-rc-init.lo: src/s6-rc/s6-rc-init.c src/include/s6-rc/s6rc.h
+src/s6-rc/s6-rc-fdholder-filler.o src/s6-rc/s6-rc-fdholder-filler.lo: src/s6-rc/s6-rc-fdholder-filler.c
+src/s6-rc/s6-rc-init.o src/s6-rc/s6-rc-init.lo: src/s6-rc/s6-rc-init.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-update.o src/s6-rc/s6-rc-update.lo: src/s6-rc/s6-rc-update.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 
@@ -29,7 +30,9 @@ s6-rc-db: private EXTRA_LIBS :=
 s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC} -lskarnet
 s6-rc-dryrun: private EXTRA_LIBS := ${TAINNOW_LIB}
 s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet
+s6-rc-fdholder-filler: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet
 s6-rc-init: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
 s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet
-s6-rc-update: private EXTRA_LIBS := ${TAINNOW_LIB}
+s6-rc-update: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
 s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} -ls6 -lexecline -lskarnet
diff --git a/package/modes b/package/modes
index 7bda1d0..d6bd849 100644
--- a/package/modes
+++ b/package/modes
@@ -1,6 +1,7 @@
-s6-rc-compile	0755
-s6-rc-db	0755
-s6-rc-dryrun	0755
-s6-rc-init	0755
-s6-rc		0755
-s6-rc-update	0755
+s6-rc-compile		0755
+s6-rc-db		0755
+s6-rc-dryrun		0755
+s6-rc-init		0755
+s6-rc			0755
+s6-rc-update		0755
+s6-rc-fdholder-filler	0755
diff --git a/package/targets.mak b/package/targets.mak
index 5f50ad4..0f4d396 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -8,6 +8,7 @@ s6-rc-init \
 s6-rc \
 s6-rc-update
 
-LIBEXEC_TARGETS :=
+LIBEXEC_TARGETS := \
+s6-rc-fdholder-filler
 
 LIB_DEFS := S6RC=s6rc
-- 
cgit v1.2.3