diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-08 09:50:07 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-08 09:50:07 +0000 |
| commit | 1ede5e54c796f37114004b2ded0071cb54a8e2a7 (patch) | |
| tree | 1afadd07e4b85802597ce3548b8949aa9266a252 /package/configure-snippets | |
| parent | 0db2f82a71f627be6b0feff3541862072653181e (diff) | |
| download | s6-frontend-1ede5e54c796f37114004b2ded0071cb54a8e2a7.tar.gz | |
Include s6 service skeleton; add boilerplate for s6li and util-linux
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'package/configure-snippets')
5 files changed, 19 insertions, 0 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index de46c9c..be1fcb4 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -1,5 +1,9 @@ --enable-nsss|--enable-nsss=yes) usensss=true ;; --disable-nsss|--enable-nsss=no) usensss=false ;; + --enable-s6li|--enable-s6li=yes) uses6li=true ;; + --disable-s6li|--enable-s6li=no) uses6li=false ;; + --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;; + --disable-util-linux|--enable-util-linux=no) useutillinux=false ;; --enable-aliases-daemontools|--enable-aliases-daemontools=yes) adaemontools=true ;; --disable-aliases-daemontools|--enable-aliases-daemontools=no) adaemontools=false ;; --enable-aliases-runit|--enable-aliases-runit=yes) arunit=true ;; diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh index d5af459..8161153 100644 --- a/package/configure-snippets/configure_generate_configh +++ b/package/configure-snippets/configure_generate_configh @@ -1,3 +1,13 @@ +echo "#undef ${package_macro_name}_USE_S6LI" +if $uses6li ; then + echo "#define ${package_macro_name}_USE_S6LI" + echo "#include <s6-linux-init/config.h>" +fi +echo "#undef ${package_macro_name}_USE_UTIL_LINUX" +if $useutillinux ; then + echo "#define ${package_macro_name}_USE_UTIL_LINUX" +fi + echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS" if $adaemontools ; then echo "#define ${package_macro_name}_WRAP_DAEMONTOOLS" diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index bbbe613..fc9bc0d 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -5,6 +5,7 @@ else echo "LIBNSSS :=" echo "MAYBEPTHREAD_LIB :=" fi + if $adaemontools ; then echo "WRAP_DAEMONTOOLS := 1" else diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index ec1eb12..8ef4317 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -1,4 +1,6 @@ --enable-nsss use the nsss library for user information [disabled] + --disable-s6li do not use s6-linux-init functionality [enabled] + --enable-util-linux use util-linux functionality [disabled] --enable-aliases-daemontools build emulation of daemontools programs [disabled] --enable-aliases-runit build emulation of runit programs [disabled] --disable-aliases-symlinks do not create daemontools/runit multicall symlinks [enabled] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index ec51f80..20675cd 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -1,4 +1,6 @@ usensss=false +uses6li=true +useutillinux=false adaemontools=false arunit=false asymlinks=true |