diff options
Diffstat (limited to 'system/s6')
| -rw-r--r-- | system/s6/APKBUILD | 50 | ||||
| -rw-r--r-- | system/s6/s6.post-upgrade | 13 |
2 files changed, 22 insertions, 41 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 1c7891d2c..52c462154 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,18 +1,19 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.11.3.0 +pkgver=2.13.0.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.13.1 +_skalibs_version=2.14.1 depends="execline" -makedepends="skalibs-dev>=$_skalibs_version execline-dev" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev execline-dev" 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" @@ -30,41 +31,8 @@ build() { package() { 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" - install_if="dev $pkgname=$pkgver-r$pkgrel" - 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="764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479 s6-2.11.3.0.tar.gz" +sha512sums="b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d s6-2.13.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 54144895b..91459ad9f 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,3 +1,16 @@ #!/bin/sh -e rm -f /etc/runlevels/default/s6 + +vnew="$1" +vold="$2" + +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 |