aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-11-04 10:16:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-11-04 10:16:37 +0000
commite60133b46d70959742104489c03b9ace2db111e1 (patch)
treee74b20e1dca9c9c2e064edc00c5ed71f8c3291d6
parentf489bd1bf6f31d739cd5ffd1bee61059dc2b5e35 (diff)
downloadaports-e60133b46d70959742104489c03b9ace2db111e1.tar.bz2
aports-e60133b46d70959742104489c03b9ace2db111e1.tar.xz
testing/diod: misc cleanups
- simplify pkgdesc - fix source url - fix depends - install configs in /etc/diod instead of /etc - use .initd as suffix for init.d script for consistency (it probably needs cleanup too)
-rw-r--r--testing/diod/APKBUILD41
-rwxr-xr-xtesting/diod/diod.initd (renamed from testing/diod/diod)0
2 files changed, 21 insertions, 20 deletions
diff --git a/testing/diod/APKBUILD b/testing/diod/APKBUILD
index bc289fb1c..f611dde04 100644
--- a/testing/diod/APKBUILD
+++ b/testing/diod/APKBUILD
@@ -3,19 +3,19 @@
pkgname=diod
pkgver=1.0.24
pkgrel=0
-pkgdesc="diod is a multi-threaded, user space file server that speaks 9P2000.L protocol."
+pkgdesc="Distributed I/O Daemon - a 9P file server"
url="http://github.com/chaos/diod"
arch="all"
license="GPLv2"
-depends="lua5.1 libcap"
-depends_dev="attr-dev lua5.1-dev"
-makedepends="$depends_dev"
+depends=""
+depends_dev=""
+makedepends="$depends_dev attr-dev lua5.1-dev ncurses-dev"
install=""
subpackages="$pkgname-doc"
-source="https://github.com/chaos/diod/archive/master.zip
-diod"
+source="https://github.com/chaos/diod/releases/download/$pkgver/diod-$pkgver.tar.gz
+ diod.initd"
-_builddir="$srcdir"/diod-master
+_builddir="$srcdir"/diod-$pkgver
prepare() {
local i
cd "$_builddir"
@@ -28,26 +28,27 @@ prepare() {
build() {
cd "$_builddir"
- ./autogen.sh || return 1
- ./configure --prefix=/usr/ --sysconfdir=/etc --sbindir=/usr/bin CFLAGS=-O2 || return 1
+ ./configure --prefix=/usr/ \
+ --sysconfdir=/etc/diod \
+ --sbindir=/usr/bin \
+ || return 1
make || return 1
}
package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
- ln -s /usr/bin/diodmount "$pkgdir"/usr/bin/mount.diod
+ ln -s diodmount "$pkgdir"/usr/bin/mount.diod
#replacing systemd.service with openrc script
- rm -rf "$pkgdir/etc/systemd"
- mkdir "$pkgdir/etc/init.d"
- cp "$srcdir/diod" "$pkgdir/etc/init.d"
- chmod +x "$pkgdir/etc/init.d"
+ rm -rf "$pkgdir/etc/dios/systemd"
+ install -Dm755 "$srcdir"/diod.initd "$pkgdir"/etc/init.d/diod \
+ || return 1
}
-md5sums="a31cf0aba61eb6c293a0f15c093cfbec master.zip
-18f81219f1a64ac596ff94e595689d43 diod"
-sha256sums="297684512f6c00d2c835357e946f1961030019d5836e56911c8aeca090d72451 master.zip
-48d8db2ffc992a2bc8f4d5446e804004932a0050cfd9d6e7b85824474e43b9b6 diod"
-sha512sums="36488bf4a6b42b1cf8bc8b5370ea913084b59394258c9337ae3d11015d4d71cf60d71366445b208e026baaf96aec8679ee9efda7a43c8b06bc54a47dc45aba8f master.zip
-963721cb06a5761101387b869f7513ffcfd2cd0e1b1bb57fb3c987d18827bc4bac6e66556b9ae6c67d3581c04565052aed410513fb2294d1e1fa235bbd7aaf9c diod"
+md5sums="00566e5d43452b977ddc607181ab2288 diod-1.0.24.tar.gz
+18f81219f1a64ac596ff94e595689d43 diod.initd"
+sha256sums="f41d2b91c1a712132f5457d9d1c3caca985f069bdc8ef27bf4c148ac1d9f8c9f diod-1.0.24.tar.gz
+48d8db2ffc992a2bc8f4d5446e804004932a0050cfd9d6e7b85824474e43b9b6 diod.initd"
+sha512sums="844adc84a2dd705dd94b1103de2a466ae94314d884d8889b6d850a08074d21ac7f5cd40e17ea63ae63cd171adfba3e1601f992d5789709699d74cc8dc8c2c663 diod-1.0.24.tar.gz
+963721cb06a5761101387b869f7513ffcfd2cd0e1b1bb57fb3c987d18827bc4bac6e66556b9ae6c67d3581c04565052aed410513fb2294d1e1fa235bbd7aaf9c diod.initd"
diff --git a/testing/diod/diod b/testing/diod/diod.initd
index 44de6b72d..44de6b72d 100755
--- a/testing/diod/diod
+++ b/testing/diod/diod.initd