modem/*: cleanup, upgrade qrtr/qcom_rmtfs, use supervise-daemon

For qrtr/qcom_rmtfs it is quite important that they are running, so we should use supervise-daemon to restart them when they crash. Also fix some linting issues. See commit log for details.

Fixes #335 (closed)

Cc @z3ntu

added category::upgrade type::feature + 1 deleted label

resolved all threads

By Alexey Min on 2020-03-07T11:13:54

mentioned in merge request !1031 (merged)

By Alexey Min on 2020-03-07T23:44:09

resolved all threads

By Alexey Min on 2020-03-08T13:18:47

approved this merge request

By Alexey Min on 2020-03-08T13:19:11

I've tested main functionality together with !1031 (merged), !1024 (merged) and !1035 (merged), so in general I think this is fine

By Alexey Min on 2020-03-08T13:37:51

I also have this diff for libqipcrtr4msmipc:

diff --git a/modem/libqipcrtr4msmipc/APKBUILD b/modem/libqipcrtr4msmipc/APKBUILD
index b2da17a2f7..665737bb8e 100644
--- a/modem/libqipcrtr4msmipc/APKBUILD
+++ b/modem/libqipcrtr4msmipc/APKBUILD
@@ -5,19 +5,17 @@ pkgdesc="LD_PRELOADable library to emulate AF_QIPCRTR socket on devices with onl
 url="https://github.com/scintill/libqipcrtr4msmipc"
 arch="armhf armv7 aarch64"
 license="GPL-3.0-or-later"
-_tag="v${pkgver}"
 makedepends="msmipc-dev"
-source="$pkgname-$_tag.tar.gz::https://github.com/scintill/libqipcrtr4msmipc/archive/${_tag}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/scintill/libqipcrtr4msmipc/archive/v$pkgver.tar.gz"
 options="!check"
-builddir="$srcdir/libqipcrtr4msmipc-$pkgver"
 
 build() {
-	cd "$builddir"
 	make C_INCLUDE_PATH=/usr/src/msmipc-dev/include
 }
 
 package() {
-	install -Dm644 "$builddir"/libqipcrtr4msmipc.so "$pkgdir"/usr/lib/preload/libqipcrtr4msmipc.so
+	install -Dm644 libqipcrtr4msmipc.so \
+		"$pkgdir"/usr/lib/preload/libqipcrtr4msmipc.so
 }
 
-sha512sums="5fd22a64d1f5dc743de2d485e3ec5c264abed4af4b63204f73a750847c15c2f91c3d0cf350bb341b61650ecb43e103475f81d77ad7b6ebb43751dcda3abb22d7  libqipcrtr4msmipc-v0.1.tar.gz"
+sha512sums="5fd22a64d1f5dc743de2d485e3ec5c264abed4af4b63204f73a750847c15c2f91c3d0cf350bb341b61650ecb43e103475f81d77ad7b6ebb43751dcda3abb22d7  libqipcrtr4msmipc-0.1.tar.gz"

By Luca Weiss on 2020-03-08T18:30:37

added 5 commits

• 72622f57 - modem/qrtr: upgrade to 1.1.0.3_git20200302
• d373cd0b - modem/qrtr: cleanup
• 7392ea5e - modem/qcom_rmtfs: upgrade to 0.2_git20200131
• a41dc0a1 - modem/qcom_rmtfs: cleanup, rename to rmtfs
• 0e37b0f5 - modem/modem-qcom-msm-{mainline,downstream}: combine to msm-modem

Compare with previous version

By Minecrell on 2020-03-08T19:32:07

resolved all threads

By Minecrell on 2020-03-08T19:32:14

added 1 commit

• 3aa2f7db - modem/modem-qcom-msm-{mainline,downstream}: combine to msm-modem

Compare with previous version

By Minecrell on 2020-03-08T19:34:02

I used the chance to finally get rid of the way too complicated package naming of modem-qcom-msm-mainline (for some reason I could never remember that name).

Both is now in one msm-modem package, which has -downstream and -mainline subpackages. rmtfs is now enabled in msm-modem, not directly in the rmtfs package (that's really bad practice...).

@minlexx You might want to re-review, sorry about that :)

Cc @z3ntu

By Minecrell on 2020-03-08T19:37:16

added 2 commits

• 01e718bf - modem/qcom_rmtfs: cleanup, rename to rmtfs
• 90cbb795 - modem/modem-qcom-msm-{mainline,downstream}: combine to msm-modem

Compare with previous version

By Minecrell on 2020-03-08T19:42:33

Could you add some provides/replaces to the packages? modem-qcom-msm-mainline-common (+downstream-common) and rmtfs?

By Luca Weiss on 2020-03-09T09:15:24

Tested on Fairphone 2 with 5.5 kernel

By Luca Weiss on 2020-03-08T21:23:52

resolved all threads

By Bart Ribbers on 2020-03-09T09:11:11