From 7f6dabcd0c10f8dd0ab7828722543fa23478dba5 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 27 Apr 2025 19:00:05 +0000 Subject: Prepare for 0.5.6.0, add pkg-config support, etc. Signed-off-by: Laurent Bercot --- package/configure-snippets/configure_case_lines | 1 + package/configure-snippets/configure_expand_dirs | 1 + .../configure-snippets/configure_generate_configh | 1 + package/configure-snippets/configure_generate_make | 1 + .../configure-snippets/configure_help_dependencies | 1 + package/configure-snippets/configure_help_install | 2 + package/configure-snippets/configure_help_options | 1 + package/configure-snippets/configure_init_vars | 1 + .../configure_slashpackage_other | 1 + package/deps-build | 6 +-- package/deps.mak | 45 +++++++++++----------- package/info | 2 +- 12 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 package/configure-snippets/configure_case_lines create mode 100644 package/configure-snippets/configure_expand_dirs create mode 100644 package/configure-snippets/configure_generate_configh create mode 100644 package/configure-snippets/configure_generate_make create mode 100644 package/configure-snippets/configure_help_dependencies create mode 100644 package/configure-snippets/configure_help_install create mode 100644 package/configure-snippets/configure_help_options create mode 100644 package/configure-snippets/configure_init_vars create mode 100644 package/configure-snippets/configure_slashpackage_other (limited to 'package') diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines new file mode 100644 index 0000000..84ba442 --- /dev/null +++ b/package/configure-snippets/configure_case_lines @@ -0,0 +1 @@ + --livedir=*) livedir=${arg#*=} ;; diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs new file mode 100644 index 0000000..2b1cf03 --- /dev/null +++ b/package/configure-snippets/configure_expand_dirs @@ -0,0 +1 @@ +livedir diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh new file mode 100644 index 0000000..b73ea47 --- /dev/null +++ b/package/configure-snippets/configure_generate_configh @@ -0,0 +1 @@ +echo "#define ${package_macro_name}_LIVE_BASE \"$livedir\"" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/package/configure-snippets/configure_generate_make @@ -0,0 +1 @@ + diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/package/configure-snippets/configure_help_dependencies @@ -0,0 +1 @@ + diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install new file mode 100644 index 0000000..9371964 --- /dev/null +++ b/package/configure-snippets/configure_help_install @@ -0,0 +1,2 @@ + --livedir=DIR default live directory [/run/s6-rc] + diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/package/configure-snippets/configure_help_options @@ -0,0 +1 @@ + diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars new file mode 100644 index 0000000..5d49114 --- /dev/null +++ b/package/configure-snippets/configure_init_vars @@ -0,0 +1 @@ +livedir=/run/s6-rc diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/package/configure-snippets/configure_slashpackage_other @@ -0,0 +1 @@ + diff --git a/package/deps-build b/package/deps-build index d63229b..3d304bf 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,3 +1,3 @@ -/package/prog/skalibs -/package/admin/execline -/package/admin/s6 +true true /package/prog/skalibs 2.14.4.0 libskarnet +true false /package/admin/execline 2.9.7.0 libexecline +true true /package/admin/s6 2.13.2.0 libs6 diff --git a/package/deps.mak b/package/deps.mak index ea15313..d03e05c 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -39,28 +39,29 @@ src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_livedir_canon.o src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o else -libs6rc.a.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_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.a.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_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 endif +libs6rc.pc: EXTRA_LIBS := -ls6 -lskarnet 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_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: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB} -s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -s6-rc-bundle: EXTRA_LIBS := -ls6 -lexecline -lskarnet -s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC} -s6-rc-compile: EXTRA_LIBS := -ls6 -lexecline -lskarnet -s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC} -s6-rc-db: EXTRA_LIBS := -ls6 -lskarnet -s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC} -s6-rc-dryrun: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} -s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -s6-rc-fdholder-filler: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} -s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -s6-rc-format-upgrade: EXTRA_LIBS := -ls6 -lskarnet -s6-rc-format-upgrade: src/s6-rc/s6-rc-format-upgrade.o ${LIBS6RC} -s6-rc-init: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB} -s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -s6-rc-oneshot-run: EXTRA_LIBS := -ls6 -lskarnet -s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -s6-rc-update: EXTRA_LIBS := -ls6 -lexecline -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB} -s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} +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_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: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB} +s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet +s6-rc-bundle: EXTRA_LIBS := +s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC} -ls6 -lexecline -lskarnet +s6-rc-compile: EXTRA_LIBS := +s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC} -ls6 -lexecline -lskarnet +s6-rc-db: EXTRA_LIBS := +s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC} -ls6 -lskarnet +s6-rc-dryrun: EXTRA_LIBS := ${SYSCLOCK_LIB} +s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet +s6-rc-fdholder-filler: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB} +s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet +s6-rc-format-upgrade: EXTRA_LIBS := +s6-rc-format-upgrade: src/s6-rc/s6-rc-format-upgrade.o ${LIBS6RC} -ls6 -lskarnet +s6-rc-init: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB} +s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet +s6-rc-oneshot-run: EXTRA_LIBS := +s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -ls6 -lskarnet +s6-rc-update: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB} +s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} -ls6 -lexecline -lskarnet INTERNAL_LIBS := diff --git a/package/info b/package/info index 8888b8d..852e657 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-rc -version=0.5.5.1 +version=0.5.6.0 category=admin package_macro_name=S6RC -- cgit v1.3.1