forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

modem/qcom_rmtfs: cleanup (!1032)

Browse source 
- use supervise-daemon to restart when necessary
- run normally, without wrapping with sh and logger
- add "need qrtr-ns" to make sure it gets started first
- stop enabling service directly in rmtfs package
  (moved to msm-modem)
This commit is contained in:
Minecrell 2020-03-06 20:42:19 +01:00 committed by Bart Ribbers
parent fa80843a46
commit f9295cfcd5
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modem/qcom_rmtfs/APKBUILD
View file

@ -7,8 +7,7 @@ url="https://github.com/andersson/rmtfs"
arch="all" arch="all"
license="BSD-3-Clause" license="BSD-3-Clause"
makedepends="eudev-dev qrtr-dev" makedepends="eudev-dev qrtr-dev"
install="$pkgname.post-install" subpackages="$pkgname-doc $pkgname-openrc"
subpackages="$pkgname-doc"
source=" source="
rmtfs-$_commit.tar.gz::https://github.com/andersson/rmtfs/archive/$_commit.tar.gz rmtfs-$_commit.tar.gz::https://github.com/andersson/rmtfs/archive/$_commit.tar.gz
qcom_rmtfs.initd qcom_rmtfs.initd
@ -22,12 +21,12 @@ build() {
} }
package() { package() {
install -Dm755 rmtfs "$pkgdir"/usr/sbin/"$pkgname" install -Dm755 rmtfs "$pkgdir"/usr/sbin/rmtfs
install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/65-qcom_rmtfs.rules" install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/65-$pkgname.rules"
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
} }
sha512sums="bdb6f0e5a37b7456c06ad5ce657b1354d5c97657b448dc29cf5dd2729a180cb9fe0aae1761ca17917626311372f6a1c8c1b6a68cebb752b2b7376cbd7fbdd2e5 rmtfs-dfb8f3ed1c8fbde621cd08aaf9e7724a4c55cbd1.tar.gz sha512sums="bdb6f0e5a37b7456c06ad5ce657b1354d5c97657b448dc29cf5dd2729a180cb9fe0aae1761ca17917626311372f6a1c8c1b6a68cebb752b2b7376cbd7fbdd2e5 rmtfs-dfb8f3ed1c8fbde621cd08aaf9e7724a4c55cbd1.tar.gz
4db920dc26dde899d86627cec6c4a21db61884c764c7ee83ba5bc1a2102d918c6d318113e21a8621bad47c7c6948362987d2980a916ccf9829d10e340d1f40b9 qcom_rmtfs.initd 0b90447c035a4540f0d817978b1dc6c8344e1a885679788e1a24877c2739ed3466d5b2a3994cbbb0e2d7ed4fce2debd8b5971d33765c0198220ff0833de9f08c qcom_rmtfs.initd
cb2435c159d81d3a40d30e1355c82a3d560dc2df7d05fee95085bc80e492ac93a728258f2f1b463c04a964979760990c8c9176b22cb585cbec19ab285cd45440 udev.rules" cb2435c159d81d3a40d30e1355c82a3d560dc2df7d05fee95085bc80e492ac93a728258f2f1b463c04a964979760990c8c9176b22cb585cbec19ab285cd45440 udev.rules"

22
modem/qcom_rmtfs/qcom_rmtfs.initd
View file

@ -1,14 +1,22 @@
#!/sbin/openrc-run #!/sbin/openrc-run
supervisor=supervise-daemon
depend() { name="RMTFS"
after udev-settle description="Qualcomm remote file system service"
}
# libqipcrtr4msmipc.so may not be present, on devices that don't need it # libqipcrtr4msmipc.so may not be present, on devices that don't need it
export LD_PRELOAD=/usr/lib/preload/libqipcrtr4msmipc.so export LD_PRELOAD=/usr/lib/preload/libqipcrtr4msmipc.so
command="/bin/sh" # -P: find and use raw EFS partitions
command_args="-c 'exec /usr/sbin/qcom_rmtfs -P -r -s -v 2>&1 | logger -t qcom_rmtfs'" # -r: avoid writing to storage
command_background="yes" # -s: enable sync for the mss rproc instance
command="/usr/sbin/rmtfs"
command_args="-P -r -s"
pidfile="/var/run/${SVCNAME}.pid" # https://github.com/andersson/rmtfs/commit/dfb8f3ed1c8fbde621cd08aaf9e7724a4c55cbd1
respawn_delay=1
depend() {
after udev-settle
need qrtr-ns
}

3
modem/qcom_rmtfs/qcom_rmtfs.post-install
View file

@ -1,3 +0,0 @@
#!/bin/sh
rc-update -q add qcom_rmtfs boot