summaryrefslogtreecommitdiffstats
path: root/system/s6-linux-init/s6-linux-init.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/s6-linux-init/s6-linux-init.SlackBuild')
-rw-r--r--system/s6-linux-init/s6-linux-init.SlackBuild78
1 files changed, 48 insertions, 30 deletions
diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index 87c3f53414..77ff74dd25 100644
--- a/system/s6-linux-init/s6-linux-init.SlackBuild
+++ b/system/s6-linux-init/s6-linux-init.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for s6-linux-init
@@ -22,10 +22,17 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=s6-linux-init
-VERSION=${VERSION:-1.0.6.0}
+VERSION=${VERSION:-1.1.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -54,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
@@ -96,9 +108,9 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -110,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 \
@@ -120,12 +133,17 @@ make
make strip
make install DESTDIR=$PKG
+# 20220413 bkw: how annoying is this? "chmod 0755" doesn't actually
+# remove the setgid bit. why upstream thinks it's a good idea to have
+# setgid doc directories, I'll never know (and never care).
+chmod a-s doc
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE