diff --git a/modem/msm-modem/APKBUILD b/modem/msm-modem/APKBUILD index a74e676b2..b601b2f35 100644 --- a/modem/msm-modem/APKBUILD +++ b/modem/msm-modem/APKBUILD @@ -1,17 +1,16 @@ pkgname=msm-modem pkgver=5 -pkgrel=0 +pkgrel=1 pkgdesc="Common support for Qualcomm MSM modems" url="https://postmarketos.org/" arch="armhf armv7 aarch64" license="GPL-3.0-or-later" depends="rmtfs rmtfs-openrc" install="$pkgname.post-install" -subpackages="$pkgname-rpmsg $pkgname-downstream $pkgname-uim-selection:uim_selection" +subpackages="$pkgname-downstream $pkgname-uim-selection:uim_selection" source=" msm-modem-downstream.initd msm-modem-uim-selection.initd - udev-rpmsg.rules udev-downstream.rules " options="!check" @@ -20,13 +19,6 @@ package() { mkdir -p "$pkgdir" } -rpmsg() { - pkgdesc="$pkgdesc (via RPMSG)" - depends="$pkgname rpmsgexport" - - install -Dm644 "$srcdir/udev-rpmsg.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules" -} - uim_selection() { pkgdesc="$pkgdesc (UIM selection)" depends="$pkgname libqmi" @@ -47,6 +39,5 @@ downstream() { sha512sums=" 3172f8c409f552f13d1da29f14ab6c79072cd6da4acab151a1a0ea1858a416974456852609f14fe29cf97a6a45e60b99d0a57ddcde751da243ee5ac6fa8b672c msm-modem-downstream.initd 9ce373d668a4324ef4d2f465b2524e45b46dc2b93a718ec6bd0c681a99a6506c707083dc9295f30a704526f7b2c508af8bef873fd2ef7ee4638f573677ac79e4 msm-modem-uim-selection.initd -11437625988fcf57aa0b70f11496c458d4516de16391c2869ae975362f282d21d3af521a41dea00312797d20d52be5112dbf0041986bfb40f3b9fa5948d2c695 udev-rpmsg.rules 2a511c2e249d0ec5a52f04ffe1ef3d29cf3c4813143b103e54879ff89176ea45b1a5ffe21cb7dc2f1cdd84c3102ba45ef9926ed37e00b1ae12a36d01de35ea5a udev-downstream.rules " diff --git a/modem/msm-modem/udev-rpmsg.rules b/modem/msm-modem/udev-rpmsg.rules deleted file mode 100644 index 36836db02..000000000 --- a/modem/msm-modem/udev-rpmsg.rules +++ /dev/null @@ -1,14 +0,0 @@ -SUBSYSTEM!="rpmsg", GOTO="qcom_rpmsg_end" - -# symlink rpmsg endpoints under useful names -ATTR{name}=="DATA5_CNTL", SYMLINK+="modem" -ATTR{name}=="DATA4", SYMLINK+="modem-at" - -# open SMD channels when the remoteproc comes up -KERNEL!="rpmsg_ctrl[0-9]*", GOTO="qcom_rpmsg_end" -ATTRS{rpmsg_name}!="modem|hexagon", GOTO="qcom_rpmsg_end" - -ACTION=="add", RUN+="/usr/sbin/rpmsgexport /dev/$name DATA5_CNTL" -ACTION=="add", RUN+="/usr/sbin/rpmsgexport /dev/$name DATA4" - -LABEL="qcom_rpmsg_end"