Add s6-rc-repo-init, s6-rc-repo-populate

Signed-off-by: Laurent Bercot <ska@appnovation.com>

8 files changed, 18 insertions, 2 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 84ba442..1659cc4 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1 +1,3 @@
     --livedir=*) livedir=${arg#*=} ;;
+    --repodir=*) repodir=${arg#*=} ;;
+
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 2b1cf03..d020001 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-livedir
+livedir repodir
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index b73ea47..679b6f8 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -1 +1,3 @@
 echo "#define ${package_macro_name}_LIVE_BASE \"$livedir\""
+echo "#define ${package_macro_name}_REPO_BASE \"$repodir\""
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index 9371964..cb03148 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -1,2 +1,3 @@
   --livedir=DIR                 default live directory [/run/s6-rc]
+  --repodir=DIR                 default repo directory [/var/lib/s6-rc/repository]
 
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 5d49114..e3d8701 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1 +1,2 @@
 livedir=/run/s6-rc
+repodir=/var/lib/s6-rc/repository
diff --git a/package/deps.mak b/package/deps.mak
index 74c853d..6982515 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -27,6 +27,8 @@ src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_internal.lo:
 src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_manage.lo: src/libs6rc/s6rc_servicedir_manage.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_unblock.lo: src/libs6rc/s6rc_servicedir_unblock.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_servicedir_unsupervise.lo: src/libs6rc/s6rc_servicedir_unsupervise.c src/include/s6-rc/s6rc-servicedir.h
+src/repo/s6-rc-repo-init.o src/repo/s6-rc-repo-init.lo: src/repo/s6-rc-repo-init.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
+src/repo/s6-rc-repo-populate.o src/repo/s6-rc-repo-populate.lo: src/repo/s6-rc-repo-populate.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-bundle.o src/s6-rc/s6-rc-bundle.lo: src/s6-rc/s6-rc-bundle.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.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/config.h 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
@@ -48,6 +50,10 @@ libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.so.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
 libs6rc.dylib.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
+s6-rc-repo-init: EXTRA_LIBS :=
+s6-rc-repo-init: src/repo/s6-rc-repo-init.o -lskarnet
+s6-rc-repo-populate: EXTRA_LIBS :=
+s6-rc-repo-populate: src/repo/s6-rc-repo-populate.o -lskarnet
 s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet
 s6-rc-bundle: EXTRA_LIBS :=
diff --git a/package/modes b/package/modes
index e803335..60cdf3e 100644
--- a/package/modes
+++ b/package/modes
@@ -8,3 +8,5 @@ s6-rc-update		0755
 s6-rc-fdholder-filler	0755
 s6-rc-oneshot-run	0755
 s6-rc-format-upgrade	0755
+s6-rc-repo-init		0755
+s6-rc-repo-populate	0755
diff --git a/package/targets.mak b/package/targets.mak
index 522b1e3..b5ef01e 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -6,7 +6,9 @@ s6-rc-bundle \
 s6-rc-init \
 s6-rc \
 s6-rc-update \
-s6-rc-format-upgrade
+s6-rc-format-upgrade \
+s6-rc-repo-init \
+s6-rc-repo-populate
 
 LIBEXEC_TARGETS := \
 s6-rc-fdholder-filler \