mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
system/s6: Updated for version 2.11.1.1, remove unneeded sed
command, general fixups/cleanups
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
81aafc6bf5
commit
a324d15a49
3 changed files with 31 additions and 41 deletions
|
@ -1,15 +1,13 @@
|
|||
s6 is a small suite of programs for UNIX, designed to allow process
|
||||
supervision (a.k.a service supervision), in the line of daemontools
|
||||
and runit, as well as various operations on processes and daemons. It
|
||||
is meant to be a toolbox for low-level process and service
|
||||
administration, providing different sets of independent tools that can
|
||||
be used within or without the framework, and that can be assembled
|
||||
together to achieve powerful functionality with a very small amount of
|
||||
code.
|
||||
supervision (a.k.a service supervision), in the line of daemontools and
|
||||
runit, as well as various operations on processes and daemons. It is
|
||||
meant to be a toolbox for low-level process and service administration,
|
||||
providing different sets of independent tools that can be used within or
|
||||
without the framework, and that can be assembled together to achieve
|
||||
powerful functionality with a very small amount of code.
|
||||
|
||||
Examples of things you can do by assembling together several programs
|
||||
provided by s6 - besides process supervision:
|
||||
|
||||
- syslogd functionality, using much less resources than the traditional
|
||||
syslogd.
|
||||
- Reliable service readiness notification, which is the basis for
|
||||
|
@ -21,14 +19,14 @@ provided by s6 - besides process supervision:
|
|||
without having to switch to any specific init system.
|
||||
|
||||
NOTE:
|
||||
Upstream recommends building skarnet.org softwares with static libraries
|
||||
as most of skarnet.org softwares are small enough that using shared
|
||||
libraries are generally not worth using. Therefore, by default, shared
|
||||
libraries are not built and binaries are linked against the static
|
||||
versions of the skarnet.org libraries.
|
||||
Upstream recommends building skarnet.org software with static libraries,
|
||||
as most of skarnet.org software are small enough that shared libraries
|
||||
are generally not worth using. Therefore, by default, shared libraries
|
||||
are not built and binaries are linked against the static versions of the
|
||||
skarnet.org libraries.
|
||||
|
||||
If you want to also build the shared libraries, pass BUILD_SHARED=yes
|
||||
environment variable to the SlackBuild script like below:
|
||||
environment variable to this SlackBuild script like below:
|
||||
|
||||
BUILD_SHARED=yes ./s6.SlackBuild
|
||||
|
||||
|
@ -38,7 +36,7 @@ libraries and not the static ones, you can do something like:
|
|||
|
||||
BUILD_SHARED=yes BUILD_STATIC=no ./s6.SlackBuild
|
||||
|
||||
If you just want to build and use skarnet.org softwares, building only
|
||||
If you just want to build and use skarnet.org software, building only
|
||||
the static libraries should be sufficient.
|
||||
|
||||
If you want the binaries to be linked against the shared versions of the
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PRGNAM=s6
|
||||
VERSION=${VERSION:-2.11.1.0}
|
||||
BUILD=${BUILD:-2}
|
||||
VERSION=${VERSION:-2.11.1.1}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
PKGTYPE=${PKGTYPE:-tgz}
|
||||
|
||||
|
@ -64,28 +64,21 @@ 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}
|
||||
[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
|
||||
[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
|
||||
|
||||
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
|
||||
# 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}
|
||||
|
||||
if [ "$LINK_SHARED" = "yes" ]; then
|
||||
LIBS_CONF="--disable-allstatic $LIBS_CONF"
|
||||
fi
|
||||
[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
|
||||
|
||||
set -e
|
||||
|
||||
|
@ -123,10 +116,9 @@ make install DESTDIR=$PKG
|
|||
mkdir $PKG/sbin
|
||||
mv $PKG/bin/s6-{set,apply}uidgid $PKG/sbin
|
||||
|
||||
# Promote s6-svscanboot to /sbin for users that want to use s6
|
||||
# alongside Slackware's default init system
|
||||
# Promote s6-svscanboot to /sbin for users that want to use s6 alongside
|
||||
# Slackware's default init system
|
||||
install examples/s6-svscanboot $PKG/sbin
|
||||
sed -i 's|command|bin|g' $PKG/sbin/s6-svscanboot
|
||||
|
||||
chmod -R -t examples
|
||||
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="s6"
|
||||
VERSION="2.11.1.0"
|
||||
VERSION="2.11.1.1"
|
||||
HOMEPAGE="https://skarnet.org/software/s6/"
|
||||
DOWNLOAD="https://skarnet.org/software/s6/s6-2.11.1.0.tar.gz"
|
||||
MD5SUM="95e6301df8f5cf42cedc87151afde8b2"
|
||||
DOWNLOAD="https://skarnet.org/software/s6/s6-2.11.1.1.tar.gz"
|
||||
MD5SUM="21ef4d0113c8fc62323b24b37322b321"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="skalibs execline"
|
||||
|
|
Loading…
Reference in a new issue