diff options
Diffstat (limited to 'system/s6')
| -rw-r--r-- | system/s6/APKBUILD | 61 | ||||
| -rw-r--r-- | system/s6/s6.post-upgrade | 28 | ||||
| -rw-r--r-- | system/s6/s6.trigger | 2 |
3 files changed, 24 insertions, 67 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 6a87bdd52..022dc594c 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,71 +1,36 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.9.0.0 +pkgver=2.13.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" -url="https://skarnet.org/software/$pkgname/" +url="https://skarnet.org/software/s6/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9.0.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 depends="execline" -makedepends="skalibs-dev>=$_skalibs_version execline-dev" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev execline-dev>=$_execline_version" install="$pkgname.post-upgrade" -subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" triggers="$pkgname.trigger=/run/service" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ - --enable-static \ - --enable-allstatic \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ - --libdir=/usr/lib \ - --libexecdir="/lib/$pkgname" \ - --with-dynlib=/lib + --libexecdir="/lib/$pkgname" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" + mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc" + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } - -libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/lib" - mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/" -} - - -dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - mkdir -p "$subpkgdir/usr" - mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/" -} - - -libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/lib" - mv "$pkgdir"/lib/*.so "$subpkgdir/lib/" -} - - -doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" -} - -sha512sums="0ac007c1464633ec6c6acc75e845fee99c6ad8ec8ac52fc646bd542559f281a94035f18b3f8858bf13249f52b9d512253edfdaf6d74a56488f00cc3be64b2df6 s6-2.9.0.0.tar.gz" +sha512sums="0ee3b319fb0731681e8823bd6c0b415c556b87819b1ca72be2ff622b4f35f87ffe7a71ccaa2c783933d76eedcde7ded1fe767ee44a63e1717b2299a2b5aa81e1 s6-2.13.2.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 26d289c27..91459ad9f 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,24 +1,16 @@ #!/bin/sh -e -newv="$1" -oldv="$2" - rm -f /etc/runlevels/default/s6 -if test `apk version -t "$oldv" 2.8` = "<" ; then - - cat <<EOF - -* -* The s6 package has been upgraded. To complete the upgrade, you need to -* restart the supervision tree - with the following command, run as root: -* -* s6-svscanctl -t /run/service -* -* Running this command will instantly log everyone out of all the -* terminals that are listed in the GETTYS variable in /etc/conf.d/gettys -* - so please save your work first. -* +vnew="$1" +vold="$2" -EOF +if test `apk version -t $vnew 2.13` != '<' && test `apk version -t $vold 2.13` = '<' ; then + echo + echo '***' + echo 'The s6 package has undergone an ABI change.' + echo 'Please reboot at your earliest convenience. Commands such as s6-svstat' + echo 'may not work until you do so.' + echo '***' + echo fi diff --git a/system/s6/s6.trigger b/system/s6/s6.trigger index 8db8d9a5a..36aa83841 100644 --- a/system/s6/s6.trigger +++ b/system/s6/s6.trigger @@ -1,3 +1,3 @@ #!/bin/execlineb -P -s6-svscanctl -aN /run/service +s6-svscanctl -an /run/service |