From 86d4e09940879f1959e6afeaf2302c29cfe87394 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 15 Apr 2024 16:55:56 +0000 Subject: system/utmps: simplify APKBUILD --- system/utmps/APKBUILD | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 9653da128..2a10a007b 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot pkgname=utmps pkgver=0.1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/utmps/" arch="all" @@ -11,7 +11,7 @@ license="ISC" depends="execline s6" _skalibs_version=2.14 makedepends="skalibs-dev>=$_skalibs_version" -subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-openrc" +subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc" install="$pkgname.post-upgrade" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz utmpd.run @@ -35,9 +35,10 @@ build() { package() { make DESTDIR="$pkgdir" install runimage="$pkgdir/etc/s6-linux-init/current/run-image" - mkdir -p -m 0755 "$runimage/utmps" + mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc" chown utmp:utmp "$runimage/utmps" - install -D -m755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" + install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } openrc() { @@ -61,36 +62,6 @@ openrc() { ln -s ../../init.d/utmps "$rldir/utmps" } -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="57a73658ecb947af9dfad7a5e2931660ad1b8fa61d36c803c373e8aba13e9afa8398c1522765f5ea2b5df87d942cea17062faf30f589afa6acc744ff3ae4a409 utmps-0.1.2.2.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run 9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run -- cgit v1.2.3-60-g2f50