aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDermot Bradley <dermot_bradley@yahoo.com>2021-01-21 23:24:42 +0000
committerLeo <thinkabit.ukim@gmail.com>2021-01-22 01:55:07 +0000
commit352cf4e77d554e6b896a616602b23b87a8c3fb5e (patch)
tree5e5a22625c74b4b3355c559c458c0a3696d3a299
parent1c18a3869fb08d81024619251b97b0c42215ab85 (diff)
downloadaports-352cf4e77d554e6b896a616602b23b87a8c3fb5e.tar.gz
aports-352cf4e77d554e6b896a616602b23b87a8c3fb5e.tar.bz2
aports-352cf4e77d554e6b896a616602b23b87a8c3fb5e.tar.xz
community/s6-overlay: upgrade to 2.2.0.0
Upgrade version. Remove patch no longer required.
-rw-r--r--community/s6-overlay/01-ensure-folderd-fifo-exists.patch38
-rw-r--r--community/s6-overlay/APKBUILD36
2 files changed, 18 insertions, 56 deletions
diff --git a/community/s6-overlay/01-ensure-folderd-fifo-exists.patch b/community/s6-overlay/01-ensure-folderd-fifo-exists.patch
deleted file mode 100644
index 7d752ff3a2..0000000000
--- a/community/s6-overlay/01-ensure-folderd-fifo-exists.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: catchall logger - make sure the fdholderd supervision directory is created
-Date: 21/11/2020
-
-Upstream commit in Master.
-
----
-
-diff -aur a/etc/s6/init-catchall/init-stage1 b/etc/s6/init-catchall/init-stage1
---- a/etc/s6/init-catchall/init-stage1
-+++ b/etc/s6/init-catchall/init-stage1
-@@ -25,6 +25,15 @@
- if { s6-rmrf /var/run/s6/services }
- if { s6-hiercopy /etc/s6/services /var/run/s6/services }
-
-+##
-+## ensure s6-fdholderd fifo exists
-+##
-+
-+if { s6-rmrf /var/run/s6/services/s6-fdholderd/supervise }
-+if { s6-mkdir -m 0700 /var/run/s6/services/s6-fdholderd/supervise }
-+if { s6-rmrf /var/run/s6/services/s6-fdholderd/supervise/control }
-+if { s6-mkfifo -m 0600 /var/run/s6/services/s6-fdholderd/supervise/control }
-+
-
- ##
- ## fork the "init-stage2" script
-diff -aur a/etc/s6/init-no-catchall/init-stage1 b/etc/s6/init-no-catchall/init-stage1
---- a/etc/s6/init-no-catchall/init-stage1
-+++ b/etc/s6/init-no-catchall/init-stage1
-@@ -10,7 +10,7 @@
-
-
- ##
--## ensure our vital fifo exists
-+## ensure s6-fdholderd fifo exists
- ##
-
- if { s6-rmrf /var/run/s6/services/s6-fdholderd/supervise }
diff --git a/community/s6-overlay/APKBUILD b/community/s6-overlay/APKBUILD
index 5bab6d6053..0fe08d211e 100644
--- a/community/s6-overlay/APKBUILD
+++ b/community/s6-overlay/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Dermot Bradley <dermot_bradley@yahoo.com>
pkgname=s6-overlay
-pkgver=2.1.0.0
-pkgrel=1
+pkgver=2.2.0.0
+pkgrel=0
pkgdesc="s6 overlay for containers"
url="https://github.com/just-containers/s6-overlay/"
arch="noarch"
@@ -18,27 +18,27 @@ depends="s6
s6-portable-utils
s6-rc
"
+subpackages="
+ $pkgname-doc
+ "
options="!check" # no test suite/unit tests
-source="$pkgname-$pkgver.tar.gz::https://github.com/just-containers/s6-overlay/releases/download/v$pkgver/s6-overlay-nobin.tar.gz
- 01-ensure-folderd-fifo-exists.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/just-containers/s6-overlay/archive/v$pkgver.tar.gz
"
-prepare() {
- # The source tarball unpacks straight into the current directory
- # and so we create a versioned subdir for the package and move
- # the files into it.
- mkdir "$srcdir/$pkgname-$pkgver"
- mv "$srcdir"/etc "$srcdir"/init "$srcdir"/usr \
- "$srcdir/$pkgname-$pkgver"
-
- default_prepare
-}
-
package() {
mkdir -p "$pkgdir"
- cp -a "$srcdir/$pkgname-$pkgver"/* "$pkgdir"/
+ # We only need to package the contents of the builder/overlay-rootfs
+ # directory plus some docs files, so move that sub-directory plus
+ # some docs files to the package directory.
+ mv "$srcdir/$pkgname-$pkgver"/builder/overlay-rootfs/* \
+ "$pkgdir"/
+ mkdir -p "$pkgdir"/usr/share/doc/$pkgname
+ mv "$srcdir/$pkgname-$pkgver"/AUTHORS.md \
+ "$srcdir/$pkgname-$pkgver"/CONTRIBUTORS.md \
+ "$srcdir/$pkgname-$pkgver"/LICENSE.md \
+ "$srcdir/$pkgname-$pkgver"/README.md \
+ "$pkgdir"/usr/share/doc/$pkgname
}
-sha512sums="6af21a6e4743fa9125cc19cd9b4c6c527a4634325b3b8c75bf795f3ca191a307649575e6448ed929d5598beab1630350a0cf9abc13c949deb63c1b3e7bf4c2d3 s6-overlay-2.1.0.0.tar.gz
-2e48d4169d4d54c889ccff2a518a96707ebd63c6348fed24adc998abdaa107f1546c4b995542cbd193c8193e5e24fc7c7d52e508578610f4e8a542a264530f8b 01-ensure-folderd-fifo-exists.patch"
+sha512sums="7debe644396eafa77225dd7a46cfa1892f7adeafb11d1d7ff46d04b7b2e81421efe55e9f797cd8081d87b76e3e0c25df55a7c79ffbe139deb6f442140f945c68 s6-overlay-2.2.0.0.tar.gz"