community/modemmanager: fix wrong dbus dir

* add .initd file in -openrc subpkg in case you want to start MM w/o dbus

fixes #7957

2 files changed, 18 insertions, 5 deletions

diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index 914bf4326f..ae3f79fd6c 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=modemmanager
 pkgver=1.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ModemManager library"
 url="http://www.freedesktop.org/wiki/Software/ModemManager"
 arch="all"
@@ -12,10 +12,10 @@ makedepends="$depends_dev gobject-introspection-dev gtk-doc vala
         libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
 checkdepends="glib-dev"
 options="!check" # https://bugs.freedesktop.org/show_bug.cgi?id=101197
-subpackages="$pkgname-lang $pkgname-doc libmm-glib:libmm $pkgname-dev"
+subpackages="$pkgname-lang $pkgname-doc libmm-glib:libmm $pkgname-dev $pkgname-openrc"
 source="https://www.freedesktop.org/software/ModemManager/ModemManager-$pkgver.tar.xz
         $pkgname.rules
-        "
+        $pkgname.initd"
 builddir="$srcdir"/ModemManager-$pkgver
 
 build() {
@@ -30,7 +30,7 @@ build() {
                 --disable-static \
                 --enable-more-warnings \
                 --with-newest-qmi-commands \
-                --with-dbus-sys-dir=/etc/dbus-1 \
+                --with-dbus-sys-dir=/etc/dbus-1/system.d \
                 --enable-vala=yes
         make
 }
@@ -53,6 +53,8 @@ package() {
         mkdir -p "$pkgdir/usr/share/polkit-1/rules.d"
         install -m644 -D "$srcdir/$pkgname.rules" \
                 "$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+        install -m755 -D "$srcdir/$pkgname.initd" \
+                "$pkgdir/etc/init.d/$pkgname"
         # post-install message
         mkdir -p "$pkgdir/usr/share/doc/$pkgname"
         cat > $pkgdir/usr/share/doc/$pkgname/README.alpine <<EOF
@@ -68,4 +70,5 @@ check() {
 }
 
 sha512sums="7c8b123d4f337a9d19726e241c0e52089e9075cb17ea1e8cd9ca60ed5bc135331bcf0bec054f261c5611149bf1838b27abf8dc3fc7aa39be166917156b491bd7  ModemManager-1.12.0.tar.xz
-3c76ee577334e25c836857f8e7fef6a249cdd9fcd8f889cb64d9c1667bc6a95c087267a153bddd1a13256c59f8cd578ccb448e6b9cb54b73bb74acb8a0ca1e3f  modemmanager.rules"
+3c76ee577334e25c836857f8e7fef6a249cdd9fcd8f889cb64d9c1667bc6a95c087267a153bddd1a13256c59f8cd578ccb448e6b9cb54b73bb74acb8a0ca1e3f  modemmanager.rules
+e2769401c52c3fff0b8057c13c6f7f2e5656c2963239ecbd647a01e66a344f6852cf2ba065358248315945bdf6ebbc4976903565b12ace2d15df6586dcc1de5b  modemmanager.initd"
diff --git a/community/modemmanager/modemmanager.initd b/community/modemmanager/modemmanager.initd
new file mode 100644
index 0000000000..838a7f5c6a
--- /dev/null
+++ b/community/modemmanager/modemmanager.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+supervisor=supervise-daemon
+command=/usr/sbin/ModemManager
+
+description="ModemManager Daemon"
+
+depend() {
+   need dbus
+}