summaryrefslogtreecommitdiff
path: root/system/s6/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'system/s6/APKBUILD')
-rw-r--r--system/s6/APKBUILD40
1 files changed, 24 insertions, 16 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 77a123cd9..546c50f16 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,20 +1,20 @@
-# Contributor: John Regan <john@jrjrtech.com>
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.7.1.1
-pkgrel=0
+pkgver=2.7.2.0
+pkgrel=1
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-makedepends="skalibs-dev execline-dev"
-install="s6.pre-install s6.pre-upgrade"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
-triggers="s6.trigger=/run/service"
+depends_dev="skalibs-dev execline-dev"
+makedepends="skalibs-dev>=2.7 execline-dev"
+install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
+subpackages="$pkgname-dev $pkgname-doc"
+triggers="$pkgname.trigger=/run/service"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
- s6-svscanboot
- s6.initd"
+ s6-svscanboot agetty-run"
build() {
@@ -33,9 +33,17 @@ package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot"
- mkdir -p "$pkgdir/etc/init.d"
- cp -f "$srcdir/s6.initd" "$pkgdir/etc/init.d/s6"
- chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" "$pkgdir/etc/init.d/s6"
+ mkdir -p -m 0755 "$pkgdir/etc/s6/early-services" "$pkgdir/var/lib/s6/services"
+ chmod 0755 "$pkgdir/lib/s6/s6-svscanboot"
+
+
+ # The getty scripts are created here
+
+ for i in 1 2 3 4 5 6 ; do
+ mkdir -m 0755 "$pkgdir/etc/s6/early-services/getty-$i"
+ sed -e "s/%TTY%/tty$i/g" < "$srcdir/agetty-run" > "$pkgdir/etc/s6/early-services/getty-$i/run"
+ chmod 0755 "$pkgdir/etc/s6/early-services/getty-$i/run"
+ done
}
doc() {
@@ -44,6 +52,6 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79 s6-2.7.1.1.tar.gz
-871ca1f86b354b7c63ce1d3bef8794627e176f993144ed67a17d0a069f5ac2164d94aba980711f61ad349dcd4fe2bf928195f2121a75e611c9897d73f1af12a0 s6-svscanboot
-e7f4fcdc04fc7f72df4419018d048e14f80d50d01ebc284b6d208d6bada3201ca91be0a110930618a26fb0e6bcc1603de01467f6f1dc635c8dcae60f1a0b1b9b s6.initd"
+sha512sums="0ab98c44324054effa0754efd117b3126a53fac7096979aacffd7d86128c5cb1f714205e30ca4e561ca3740646d1f36eb53b9e30d139d7ce4dc1b8cfb3e33123 s6-2.7.2.0.tar.gz
+b4919f76498f86257e13210010a84284dd8574db062b96bcc527c0c5dcc2a35716ff0f3c4d23cb3ec7eed416f16aeec31247b1fda3bd06c1a8f6fd65cf32c6da s6-svscanboot
+fb60b841da03583ba9f0f0541b45e4cf88fa5311b26376042e951317428dcaa6c81bb6c739c7a442ef0d36e1581a29cb9c4fb2d87411268fb23a033130fc8051 agetty-run"