From 0d7726bf19f5ae2d39e67670493d80a27c2be83e Mon Sep 17 00:00:00 2001 From: Nikita Travkin Date: Sun, 1 Aug 2021 14:58:08 +0500 Subject: [PATCH] modem/msm-modem: fix uim-selection service dependencies (MR 2399) uim-selection has "after *" in it's dependencies to make sure the theoretical up to ~1min delay can't be observed. Unfortunaely this causes incorrect dependencies ordering if one of other services depends on ofono or modemmanager. Drop "after *" so modem can always be started properly. --- modem/msm-modem/APKBUILD | 4 ++-- modem/msm-modem/msm-modem-uim-selection.initd | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modem/msm-modem/APKBUILD b/modem/msm-modem/APKBUILD index a88bb538b..de82c6deb 100644 --- a/modem/msm-modem/APKBUILD +++ b/modem/msm-modem/APKBUILD @@ -1,6 +1,6 @@ pkgname=msm-modem pkgver=4 -pkgrel=0 +pkgrel=1 pkgdesc="Common support for Qualcomm MSM modems" url="https://postmarketos.org/" arch="armhf armv7 aarch64" @@ -46,7 +46,7 @@ downstream() { sha512sums=" 3172f8c409f552f13d1da29f14ab6c79072cd6da4acab151a1a0ea1858a416974456852609f14fe29cf97a6a45e60b99d0a57ddcde751da243ee5ac6fa8b672c msm-modem-downstream.initd -a68b3887aa24d88faeb84fa0896e1ebff4a2cbe9e71dd5123a517d6b2aba01576469afdc1817b17b7f010e1d33e50409fab3099993c422c01de94405ef98c176 msm-modem-uim-selection.initd +28668a53eb5854d89ae509d0187092610dfe26c4f5b30b9424240c320095fd40742974bf8daa18aa2759ffb4a3d1fff74b2ed063018082ff5dc5cbc45d52d8ab msm-modem-uim-selection.initd 11437625988fcf57aa0b70f11496c458d4516de16391c2869ae975362f282d21d3af521a41dea00312797d20d52be5112dbf0041986bfb40f3b9fa5948d2c695 udev-rpmsg.rules 2a511c2e249d0ec5a52f04ffe1ef3d29cf3c4813143b103e54879ff89176ea45b1a5ffe21cb7dc2f1cdd84c3102ba45ef9926ed37e00b1ae12a36d01de35ea5a udev-downstream.rules " diff --git a/modem/msm-modem/msm-modem-uim-selection.initd b/modem/msm-modem/msm-modem-uim-selection.initd index 5076e6dc4..ca801604b 100644 --- a/modem/msm-modem/msm-modem-uim-selection.initd +++ b/modem/msm-modem/msm-modem-uim-selection.initd @@ -7,10 +7,6 @@ name="UIM Slot selection" description="Select UIM slot and application on the embedded QMI nodem." depend() { - # FIXME: This service may delay boot for some time, make sure that it - # runs after UI and sshd so preceived boot time isn't affected. - after * - need rmtfs before ofono before modemmanager