Skaware.20240531

1 files changed, 12 insertions, 39 deletions

diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 9c2d7206e..973037509 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-linux-init
 pkgver=1.1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A s6-based init system"
 url="https://skarnet.org/software/s6-linux-init/"
 arch="all"
@@ -11,8 +11,15 @@ license="ISC"
 _skalibs_version=2.14
 _s6_version=2.12
 depends="execline s6>=$_s6_version s6-linux-init-common"
-makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
-subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-dracut"
+depends_dev="skalibs-dev>=$_skalibs_version"
+makedepends="$depends_dev execline-dev s6-dev utmps-dev"
+subpackages="
+	$pkgname-common:common:noarch
+	$pkgname-early-getty:earlygetty:noarch
+	$pkgname-dracut:dracut:noarch
+	$pkgname-libs
+	$pkgname-dev
+	$pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run dracut_module.sh"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 provides="/sbin/init=0"
@@ -52,10 +59,11 @@ package() {
 	  -s /run/kernel_env \
 	  -f "$pkgdir/etc/s6-linux-init/skel" \
 	  -- "$pkgdir/etc/s6-linux-init/current"
-	mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty"
+	mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" "$pkgdir/usr/share/doc"
 	for i in init halt poweroff reboot shutdown telinit ; do
 		ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i"
 	done
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
 
@@ -85,47 +93,12 @@ earlygetty() {
 	chmod 0755 "$subsvcimg/s6-linux-init-early-getty/run"
 }
 
-
-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/"
-}
-
-
 dracut() {
 	pkgdesc="$pkgdesc (Dracut module)"
 	install_if="$pkgname=$pkgver-r$pkgrel dracut"
 	install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh
 }
 
-
-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="76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786  s6-linux-init-1.1.2.0.tar.gz
 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8  rc.init
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel