aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-devel@skarnet.org>2020-10-09 11:57:42 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-10-16 11:27:56 -0300
commiteff2e554936d09f1a802597c0f70a5c4f666b8b0 (patch)
tree74f4941402da63114f6d19e0ee7089bd6b4bfc35
parent380cf12cc84bdcb221dc6b5511bd17a2220ed336 (diff)
downloadaports-eff2e554936d09f1a802597c0f70a5c4f666b8b0.tar.gz
aports-eff2e554936d09f1a802597c0f70a5c4f666b8b0.tar.bz2
aports-eff2e554936d09f1a802597c0f70a5c4f666b8b0.tar.xz
main/s6: reorganize APKBUILD, fix catchlog homedir
-rw-r--r--main/s6/APKBUILD18
-rw-r--r--main/s6/s6.pre-install2
-rw-r--r--main/s6/s6.pre-upgrade2
3 files changed, 6 insertions, 16 deletions
diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index f358a3256e..6bd7626a76 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
@@ -15,7 +15,7 @@ source="https://skarnet.org/software/s6/s6-$pkgver.tar.gz s6-svscanboot s6.initd
install="s6.pre-install s6.pre-upgrade"
triggers="s6.trigger=/run/service"
-_ipcserver_binaries="s6-ipcserver s6-ipcserver-socketbinder s6-ipcserverd s6-applyuidgid"
+_ipcserver_binaries="bin/s6-ipcserver bin/s6-ipcserver-socketbinder bin/s6-ipcserverd bin/s6-applyuidgid"
build() {
./configure \
@@ -30,10 +30,8 @@ build() {
package() {
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"
+ install -D "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot"
+ install -D "$srcdir/s6.initd" "$pkgdir/etc/init.d/s6"
}
doc() {
@@ -42,17 +40,9 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-static() {
- default_static
- rmdir -p "$pkgdir"/usr/lib || :
-}
-
ipcserver() {
depends=""
- mkdir -p "$subpkgdir/bin"
- for i in $_ipcserver_binaries; do
- mv -f "$pkgdir/bin/$i" "$subpkgdir/bin/"
- done
+ amove $_ipcserver_binaries
}
sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz
diff --git a/main/s6/s6.pre-install b/main/s6/s6.pre-install
index 6d9b6d5619..614364261b 100644
--- a/main/s6/s6.pre-install
+++ b/main/s6/s6.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
+adduser -S -D -h / -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
exit 0
diff --git a/main/s6/s6.pre-upgrade b/main/s6/s6.pre-upgrade
index 6d9b6d5619..614364261b 100644
--- a/main/s6/s6.pre-upgrade
+++ b/main/s6/s6.pre-upgrade
@@ -1,5 +1,5 @@
#!/bin/sh
addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
+adduser -S -D -h / -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
exit 0