system/s6-linux-init: Updated for version 1.0.8.0, added a new compile-time option, general fixups/cleanups

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 27 insertions, 25 deletions

diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index a550553b529e7..a9434d78fba47 100644
--- a/system/s6-linux-init/s6-linux-init.SlackBuild
+++ b/system/s6-linux-init/s6-linux-init.SlackBuild
@@ -29,8 +29,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=s6-linux-init
-VERSION=${VERSION:-1.0.7.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.8.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -65,37 +65,38 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
-
-if [ "$BUILD_STATIC" = "no" ]; then
-		LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "yes" ]; then
-		LIBS_CONF="--enable-shared $LIBS_CONF"
-fi
-
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
+
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
+[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
-if [ "$LINK_SHARED" = "yes" ]; then
-		LIBS_CONF="--disable-allstatic $LIBS_CONF"
-fi
-
-# By default, all the skeleton files from s6-linux-init are placed under /etc/s6-linux-init/skel
-# Pass SKEL_DIR=/path/to/directory to this script if you want to place it somewhere else
+# By default, all skeleton files from s6-linux-init are placed under
+# /etc/s6-linux-init/skel. Pass SKEL_DIR=/path/to/directory to this script if
+# you want to place them somewhere else.
 SKEL_DIR=${SKEL_DIR:-/etc/s6-linux-init/skel}
 
-# By default, s6-linux-init will assume that the initial tmpfs is mounted on /run
-# Pass TMPFS_DIR=/path/to/directory to this script if you want to change it
+# By default, a s6-based init system created by s6-linux-init assumes that the
+# initial tmpfs will be mounted on /run. Pass TMPFS_DIR=/path/to/directory to
+# this script if you want to change it.
 TMPFS_DIR=${TMPFS_DIR:-/run}
 
+# By default, the PID 1 s6-svscan will use $TMPFS_DIR/service as its scan
+# directory. Pass SCAN_DIR=path/to/directory to this script if you want to
+# change it. Note that $SCAN_DIR will be relative to $TMPFS_DIR, so the final
+# path will be $TMPFS_DIR/$SCAN_DIR.
+SCAN_DIR=${SCAN_DIR:-service}
+
 set -e
 
 rm -rf $PKG
@@ -121,6 +122,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --includedir=/usr/include \
   --skeldir=${SKEL_DIR} \
   --tmpfsdir=${TMPFS_DIR} \
+  --scandir=${SCAN_DIR} \
   --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \
   --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \
   --with-lib=/usr/lib${LIBDIRSUFFIX}/execline \