Verified Commit 942861a3 authored by Minecrell's avatar Minecrell 🐪 Committed by PureTryOut

modem/modem-qcom-msm-{mainline,downstream}: combine to msm-modem (!1032)

Combine modem-qcom-msm-{mainline,downstream}-common to a single APKBUILD
with mainline and downstream subpackages.

Enable rmtfs service here instead of directly in the package.

[ci:skip-vercheck]: for qrtr version fix
parent e8cdc37d
Pipeline #127412149 passed with stages
in 5 minutes and 55 seconds
......@@ -50,14 +50,14 @@ nonfree_firmware() {
downstream_firmware() {
pkgdesc="Firmware support packages for downstream kernel"
depends="$pkgname-alsa adsp-audio modem-qcom-msm-downstream-common wcnss-wlan"
depends="$pkgname-alsa adsp-audio msm-modem-downstream wcnss-wlan"
install_if="$pkgname-kernel-downstream $pkgname-nonfree-firmware"
mkdir "$subpkgdir"
}
mainline_firmware() {
pkgdesc="Firmware support packages for mainline kernel"
depends="modem-qcom-msm-mainline-common firmware-adreno"
depends="msm-modem-mainline firmware-adreno"
install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
mkdir "$subpkgdir"
}
......
......@@ -57,8 +57,8 @@ weston() {
}
nonfree_firmware() {
pkgdesc="Wifi, GPU, Modem and ADSP firmware"
depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem modem-qcom-msm-mainline-common"
pkgdesc="WiFi, GPU, Modem and ADSP firmware"
depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem msm-modem-mainline"
mkdir "$subpkgdir"
}
......
......@@ -22,9 +22,9 @@ package() {
}
nonfree_firmware() {
pkgdesc="Firmware for Modem and Wifi"
pkgdesc="Firmware for Modem and WiFi"
# Non-firmware packages placed here, because they aren't useful without firmware
depends="firmware-samsung-i9195-modem firmware-samsung-i9195-wlan modem-qcom-msm-downstream-common"
depends="firmware-samsung-i9195-modem firmware-samsung-i9195-wlan msm-modem-downstream"
mkdir "$subpkgdir"
}
......
......@@ -2,7 +2,7 @@
pkgname="soc-qcom-msm8916"
pkgdesc="Common package for Qualcomm MSM8916 devices"
pkgver=3
pkgrel=0
pkgrel=1
url="https://postmarketos.org"
license="BSD-3-Clause"
arch="aarch64 armv7"
......@@ -21,7 +21,7 @@ package() {
}
modem() {
depends="modem-qcom-msm-mainline-common"
depends="msm-modem-mainline"
mkdir "$subpkgdir"
}
......
pkgname=modem-qcom-msm-downstream-common
pkgver=0.1
pkgrel=1
pkgdesc="Common support for Qualcomm MSM modems on the downstream kernel"
url="https://postmarketos.org/"
arch="armhf armv7 aarch64"
license="GPL-3.0-or-later"
depends="qcom_rmtfs libqipcrtr4msmipc libsmdpkt_wrapper"
makedepends=""
options="!check"
subpackages=""
source="udev.rules"
package() {
install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
}
sha512sums="64a40fb88d40ae0ff64d3545f7a54c6f10f2ab366ef75b8b158c2d5a3733223839c87aed8d5c6685d5056a5840d3943e68c76bd1bda2b48388161849d5e253f3 udev.rules"
pkgname=modem-qcom-msm-mainline-common
pkgver=0.1
pkgrel=3
pkgdesc="Common support for Qualcomm MSM modems on the mainline kernel"
url="https://postmarketos.org/"
arch="armhf armv7 aarch64"
license="GPL-3.0-or-later"
depends="qcom_rmtfs rpmsgexport"
makedepends=""
options="!check"
subpackages=""
source="udev.rules"
package() {
install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
}
sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab udev.rules"
pkgname=msm-modem
pkgver=1
pkgrel=0
pkgdesc="Common support for Qualcomm MSM modems"
url="https://postmarketos.org/"
arch="armhf armv7 aarch64"
license="GPL-3.0-or-later"
depends="rmtfs"
install="$pkgname.post-install"
subpackages="$pkgname-mainline $pkgname-downstream"
source="udev-mainline.rules udev-downstream.rules"
options="!check"
package() {
mkdir -p "$pkgdir"
}
mainline() {
pkgdesc="$pkgdesc (mainline)"
depends="$pkgname rpmsgexport"
install -Dm644 "$srcdir/udev-mainline.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
}
downstream() {
pkgdesc="$pkgdesc (downstream)"
depends="$pkgname libqipcrtr4msmipc libsmdpkt_wrapper"
install -Dm644 "$srcdir/udev-downstream.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
}
sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab udev-mainline.rules
64a40fb88d40ae0ff64d3545f7a54c6f10f2ab366ef75b8b158c2d5a3733223839c87aed8d5c6685d5056a5840d3943e68c76bd1bda2b48388161849d5e253f3 udev-downstream.rules"
#!/bin/sh
rc-update add rmtfs boot
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment