aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-08-05 21:25:11 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-08-06 07:07:33 -0300
commita41860b83f49b9cfd05cb75e937623f3db4fc9df (patch)
tree3a7a69f3a619a8cb0b150b3e61bd729053e1f607
parente3f73e863eeaa1e94183bcc658bf66c6eb45d354 (diff)
downloadaports-a41860b83f49b9cfd05cb75e937623f3db4fc9df.tar.bz2
aports-a41860b83f49b9cfd05cb75e937623f3db4fc9df.tar.xz
testing/mdevd: use supervise-daemon for running mdevd
-rw-r--r--testing/mdevd/APKBUILD11
-rw-r--r--testing/mdevd/mdevd.initd13
2 files changed, 11 insertions, 13 deletions
diff --git a/testing/mdevd/APKBUILD b/testing/mdevd/APKBUILD
index d6213b92d6..1047518ea5 100644
--- a/testing/mdevd/APKBUILD
+++ b/testing/mdevd/APKBUILD
@@ -6,7 +6,7 @@
# replacing busybox mdev.
pkgname=mdevd
pkgver=0.1.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="A netlink-listening device manager similar to mdev"
url="https://skarnet.org/software/mdevd/"
arch="all"
@@ -14,13 +14,10 @@ license="ISC"
options="!check" # no tests provided
makedepends="linux-headers skalibs-dev"
subpackages="$pkgname-doc $pkgname-openrc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://skarnet.org/software/mdevd/mdevd-$pkgver.tar.gz
$pkgname.initd"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
-
./configure \
--enable-shared \
--enable-static \
@@ -29,8 +26,6 @@ build() {
}
package() {
- cd "$builddir"
-
make install DESTDIR="$pkgdir"
mkdir -p "$pkgdir"/usr/share/doc
@@ -40,4 +35,4 @@ package() {
}
sha512sums="5365ab95de1702db11ba6c7496131b81fa833b152ffab72d8f08d6bfd9a3162764ca9a465df87c6cb2f898ea7ce8f11ec2957040a425c6b30181007cca95660e mdevd-0.1.0.3.tar.gz
-0b52af599d73abba8033498c5449c82f22ab2e8ecdfaa58c5ce112604e3e9eb3ce179930891173b41026e11494a6c2e5a6cd7504853ca96beb7ff8ea3754341a mdevd.initd"
+d579d22e0047c43b8b59c73874f28690e0b5665bbe5bf1b38ebedb1df87af601412b0afc348a1ac5d985e28f9206a7d4f97b1b714e21c8cf9461c6b96b662d95 mdevd.initd"
diff --git a/testing/mdevd/mdevd.initd b/testing/mdevd/mdevd.initd
index a9feeea154..283f40682f 100644
--- a/testing/mdevd/mdevd.initd
+++ b/testing/mdevd/mdevd.initd
@@ -1,19 +1,22 @@
#!/sbin/openrc-run
-extra_started_commands="reload"
+supervisor=supervise-daemon
+
+name="Kernel Device Manager"
description="A netlink-listening device manager similar to mdev"
+
+extra_started_commands="reload"
description_reload="Reload the configuration file"
: ${cfgfile:="/etc/mdev.conf"}
: ${logfile:="/var/log/$RC_SVCNAME.log"}
-pidfile="/run/$RC_SVCNAME.pid"
required_files="$cfgfile"
command="/bin/mdevd"
command_args="-f $cfgfile ${command_args:-}"
-command_background="yes"
-start_stop_daemon_args="--stdout $logfile --stderr $logfile"
+
+supervise_daemon_args="--stdout $logfile --stderr $logfile"
depend() {
provide dev
@@ -28,6 +31,6 @@ start_pre() {
reload() {
ebegin "Reloading $name configuration"
- start-stop-daemon --signal HUP --pidfile "$pidfile"
+ supervise-daemon --signal HUP
eend $?
}