X-Original-To: alpine-aports@lists.alpinelinux.org Received: from sinay.internal.skarnet.org (85-169-122-3.rev.numericable.fr [85.169.122.3]) by lists.alpinelinux.org (Postfix) with SMTP id 28F285C4A93 for ; Sat, 3 Jun 2017 06:45:44 +0000 (GMT) Received: (qmail 25261 invoked from network); 3 Jun 2017 06:46:10 -0000 Received: from alpine.internal.skarnet.org. (HELO alpine.internal.skarnet.org) (192.168.0.4) by sinay.internal.skarnet.org. with SMTP; 3 Jun 2017 06:46:10 -0000 From: Laurent Bercot To: alpine-aports@lists.alpinelinux.org Cc: Laurent Bercot Subject: [alpine-aports] [PATCH] main/s6: Actually add the policy / startup / trigger files to the package Date: Sat, 3 Jun 2017 08:47:41 +0200 Message-Id: <20170603064741.5461-1-ska-devel@skarnet.org> X-Mailer: git-send-email 2.13.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/s6/APKBUILD | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD index 5d81159870..c62301e989 100644 --- a/main/s6/APKBUILD +++ b/main/s6/APKBUILD @@ -2,16 +2,19 @@ # Contributor: John Regan pkgname=s6 pkgver=2.5.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="skarnet.org's small & secure supervision software suite." -url="http://skarnet.org/software/$pkgname/" +url="https://skarnet.org/software/$pkgname/" arch="all" license="ISC" makedepends="skalibs-dev execline-dev" options="!check" subpackages="$pkgname-dev $pkgname-doc" -source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-svscanboot s6.initd" builddir="$srcdir/$pkgname-$pkgver" +install="s6.pre-install s6.pre-upgrade" +triggers="s6.trigger=/run/service" + build() { cd "$builddir" @@ -28,6 +31,10 @@ build() { 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" } doc() { @@ -36,4 +43,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 s6-2.5.1.0.tar.gz" +sha512sums="b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 s6-2.5.1.0.tar.gz +871ca1f86b354b7c63ce1d3bef8794627e176f993144ed67a17d0a069f5ac2164d94aba980711f61ad349dcd4fe2bf928195f2121a75e611c9897d73f1af12a0 s6-svscanboot +e7f4fcdc04fc7f72df4419018d048e14f80d50d01ebc284b6d208d6bada3201ca91be0a110930618a26fb0e6bcc1603de01467f6f1dc635c8dcae60f1a0b1b9b s6.initd" -- 2.13.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---