~alpine/aports

4 2

[alpine-aports] [PATCH] main/s6: Actually add the policy / startup / trigger files to the package

Laurent Bercot
Details
Message ID
<20170603064741.5461-1-ska-devel@skarnet.org>
Sender timestamp
1496472461
DKIM signature
missing
Download raw message
Patch: +13 -4
---
 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 <john@jrjrtech.com>
 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
---
Natanael Copa
Details
Message ID
<20170606214550.3db839a2@ncopa-desktop.copa.dup.pw>
In-Reply-To
<20170603064741.5461-1-ska-devel@skarnet.org> (view parent)
Sender timestamp
1496778350
DKIM signature
missing
Download raw message
On Sat,  3 Jun 2017 08:47:41 +0200
Laurent Bercot <ska-devel@skarnet.org> wrote:

> ---
>  main/s6/APKBUILD | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)

Something seems to be missing:

>>> s6: Checking sanity of /home/ncopa/aports/main/s6/APKBUILD...
>>> ERROR: s6: install script s6.pre-install is missing

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Laurent Bercot
Details
Message ID
<em06504704-07c9-4d33-a336-868a0fd0cb15@elzian>
In-Reply-To
<20170606214550.3db839a2@ncopa-desktop.copa.dup.pw> (view parent)
Sender timestamp
1496839113
DKIM signature
missing
Download raw message
  Huh?
  It works for me, the file is there and committed in my tree, has
been for a long time, and nothing indicates it's desynced with
origin...
  I'll try again with a pristine new aports tree, but that should not
be happening.

--
  Laurent



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Laurent Bercot
Details
Message ID
<ema54c1c16-3940-4007-ac8c-bdfba7a3f589@elzian>
In-Reply-To
<em06504704-07c9-4d33-a336-868a0fd0cb15@elzian> (view parent)
Sender timestamp
1496841995
DKIM signature
missing
Download raw message
>Huh?
>It works for me, the file is there and committed in my tree, has
>been for a long time, and nothing indicates it's desynced with
>origin...

  It looks like my tree was desynced. Apparently some earlier patch
of mine, adding the files, was not applied, or something. -_-

  Here is a patch that works against the current aports tree.

--
  Laurent
Natanael Copa
Details
Message ID
<20170607145732.30fe36fe@ncopa-desktop.copa.dup.pw>
In-Reply-To
<em06504704-07c9-4d33-a336-868a0fd0cb15@elzian> (view parent)
Sender timestamp
1496840252
DKIM signature
missing
Download raw message
On Wed, 07 Jun 2017 12:38:33 +0000
"Laurent Bercot" <ska-devel@skarnet.org> wrote:

>   Huh?
>   It works for me, the file is there and committed in my tree, has
> been for a long time, and nothing indicates it's desynced with
> origin...

Its not committed in the aports tree:
https://git.alpinelinux.org/cgit/aports/tree/main/s6

and they were not included in the patch.

>   I'll try again with a pristine new aports tree, but that should not
> be happening.
> 
> --
>   Laurent
> 
> 
> 
> ---
> Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
> Help:         alpine-aports+help@lists.alpinelinux.org
> ---
> 



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---