From 5cdf33cf1c0e6a8a0b5ef19d5cbc3c274fa35e3e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 29 Oct 2021 17:29:18 +0200 Subject: [PATCH] testing/: use _pmb_select="..." instead of kernel variants (MR 2632) --- .../testing/device-alcatel-idol347/APKBUILD | 22 +++++-------------- .../testing/device-alcatel-idol347/deviceinfo | 3 +-- device/testing/device-asus-z00l/APKBUILD | 22 +++++-------------- device/testing/device-asus-z00l/deviceinfo | 3 +-- device/testing/device-asus-z010d/APKBUILD | 22 +++++-------------- device/testing/device-asus-z010d/deviceinfo | 3 +-- device/testing/device-lg-m216/APKBUILD | 22 +++++-------------- device/testing/device-lg-m216/deviceinfo | 4 +--- .../testing/device-motorola-osprey/APKBUILD | 22 +++++-------------- .../testing/device-motorola-osprey/deviceinfo | 3 +-- 10 files changed, 30 insertions(+), 96 deletions(-) diff --git a/device/testing/device-alcatel-idol347/APKBUILD b/device/testing/device-alcatel-idol347/APKBUILD index fc66d9348..540460213 100644 --- a/device/testing/device-alcatel-idol347/APKBUILD +++ b/device/testing/device-alcatel-idol347/APKBUILD @@ -2,21 +2,21 @@ # Maintainer: Vincent Knecht pkgname=device-alcatel-idol347 pkgdesc="Alcatel OneTouch Idol 3 (4.7)" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg soc-qcom-msm8916" +depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc" makedepends="devicepkg-dev" source="deviceinfo phoc.ini pointercal" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh " +_pmb_select="soc-qcom-msm8916-rproc" build() { devicepkg_build $startdir $pkgname @@ -27,18 +27,6 @@ package() { install -D -m644 "$srcdir"/pointercal "$pkgdir"/etc/pointercal } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)" - depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader @@ -52,7 +40,7 @@ phosh() { } sha512sums=" -6a3f64ad5d56ab4b006ee2bd5c427368e7d04b9e706f6293ec2f3beaa64ef788a0bc03b359f7945ef9be9d434628e1d8572e7ea976d908e710714f035cf2e06b deviceinfo +f2671ca2d63efb59d0b3ece4defb10f512448c6b0988cb0cb56dc790b46f01a0ac180730ff49b0a027c8d4ac565d961561d3b72c2d27c6b3b0e60441f49535ad deviceinfo a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56 phoc.ini ccdfe80d56c7bf8ecce0919a9b1c6721df3c4d0f819585475d4e78b44adf66306f7c2c7082bc7c669dfbfd066028fd2ac3cf4cd2878b34262547ea1fd1f6ae3e pointercal " diff --git a/device/testing/device-alcatel-idol347/deviceinfo b/device/testing/device-alcatel-idol347/deviceinfo index a8e9edf1a..cc2aef6a0 100644 --- a/device/testing/device-alcatel-idol347/deviceinfo +++ b/device/testing/device-alcatel-idol347/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Alcatel OneTouch Idol 3 (4.7)" deviceinfo_manufacturer="Alcatel" deviceinfo_codename="alcatel-idol347" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-alcatel-idol347" -deviceinfo_dtb_mainline_modem="qcom/msm8916-alcatel-idol347-modem" +deviceinfo_dtb="qcom/msm8916-alcatel-idol347" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="smb1360 panel-alcatel-auo-hx8394d msm msg2638" deviceinfo_arch="aarch64" diff --git a/device/testing/device-asus-z00l/APKBUILD b/device/testing/device-asus-z00l/APKBUILD index aa650ae6c..a58f79e35 100644 --- a/device/testing/device-asus-z00l/APKBUILD +++ b/device/testing/device-asus-z00l/APKBUILD @@ -2,20 +2,20 @@ # Maintainer: Antony J.R. pkgname=device-asus-z00l pkgdesc="ASUS Zenfone 2 Laser (720p)" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg soc-qcom-msm8916" +depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc" makedepends="devicepkg-dev" source="deviceinfo" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-nonfree-firmware:nonfree_firmware " +_pmb_select="soc-qcom-msm8916-rproc" build() { devicepkg_build $startdir $pkgname @@ -25,18 +25,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no charging, no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem() { - pkgdesc="Close to mainline kernel (no charging, non-free modem, audio routed through ADSP)" - depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-asus-z00l-wcnss-nv" @@ -44,5 +32,5 @@ nonfree_firmware() { } sha512sums=" -dc1907ed406261f50eaf2349b2a2bf9754785dfcf3f4632e17431a2d24af954a3d24936948a70b4935f906a6486d2cbc2573d1c27177d9b3d8c38ce5ad07ba11 deviceinfo +f3978dc7eb9f9ea897185e799a5e4391da00986e2b09d6009fbf3ca9ba419859d9e3b7108744f0548d8e7a9f744273844231c8b20dd87190c89b573f63544828 deviceinfo " diff --git a/device/testing/device-asus-z00l/deviceinfo b/device/testing/device-asus-z00l/deviceinfo index 53e48c787..6e5127795 100644 --- a/device/testing/device-asus-z00l/deviceinfo +++ b/device/testing/device-asus-z00l/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="ASUS Zenfone 2 Laser (720p)" deviceinfo_manufacturer="ASUS" deviceinfo_codename="asus-z00l" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-asus-z00l" -deviceinfo_dtb_mainline_modem="qcom/msm8916-asus-z00l-modem" +deviceinfo_dtb="qcom/msm8916-asus-z00l" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-asus-z00l-otm1284a edt-ft5x06 msm" deviceinfo_arch="aarch64" diff --git a/device/testing/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD index b9e0ee51d..d6d2b6897 100644 --- a/device/testing/device-asus-z010d/APKBUILD +++ b/device/testing/device-asus-z010d/APKBUILD @@ -1,20 +1,20 @@ # Reference: pkgname=device-asus-z010d pkgdesc="Asus Zenfone Max ZC550KL" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg soc-qcom-msm8916" +depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc" makedepends="devicepkg-dev" source="deviceinfo" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-nonfree-firmware:nonfree_firmware " +_pmb_select="soc-qcom-msm8916-rproc" build() { devicepkg_build $startdir $pkgname @@ -24,18 +24,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)" - depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader @@ -44,5 +32,5 @@ nonfree_firmware() { } sha512sums=" -8c7354434ad0cbc8df6588745f991e07f59104b58771eff9b5eb22135b449f64ae605a8e8f8009de22ea2525ae4f048b5bf76ef4b9fc1ee828f26de35cb28578 deviceinfo +cb3a455fbe7c48532c07377221c9c083daaa90992ac10acea25517c9259d5c731c6ae6eaf4747001621ef87683506714c95582810bd4a28338aa878e624b092f deviceinfo " diff --git a/device/testing/device-asus-z010d/deviceinfo b/device/testing/device-asus-z010d/deviceinfo index 6915d2973..dcde1b14c 100644 --- a/device/testing/device-asus-z010d/deviceinfo +++ b/device/testing/device-asus-z010d/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Asus Zenfone Max ZC550KL" deviceinfo_manufacturer="Asus" deviceinfo_codename="asus-z010d" deviceinfo_year="2016" -deviceinfo_dtb_mainline="qcom/msm8916-asus-z010d" -deviceinfo_dtb_mainline_modem="qcom/msm8916-asus-z010d-modem" +deviceinfo_dtb="qcom/msm8916-asus-z010d" deviceinfo_append_dtb="true" deviceinfo_arch="aarch64" diff --git a/device/testing/device-lg-m216/APKBUILD b/device/testing/device-lg-m216/APKBUILD index 2de8d65d7..663f09ada 100644 --- a/device/testing/device-lg-m216/APKBUILD +++ b/device/testing/device-lg-m216/APKBUILD @@ -1,20 +1,20 @@ # Reference: pkgname=device-lg-m216 pkgdesc="LG K10 (m216)" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg soc-qcom-msm8916" +depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc" makedepends="devicepkg-dev" source="deviceinfo" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-nonfree-firmware:nonfree_firmware " +_pmb_select="soc-qcom-msm8916-rproc" build() { devicepkg_build $startdir $pkgname @@ -24,18 +24,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)" - depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader @@ -45,5 +33,5 @@ nonfree_firmware() { } sha512sums=" -d255a4b9aa5572295851159813465d60d5282105f58769400f529ccc724e5c74a484d407f00f2dcb6519a80a9f8cb75d2b970986064e567d308937c832f5342b deviceinfo +b70fb0caf142a94e31e3aff8f01fc9c1991428b4fa2876f0b5576edccd794a8d80c0db115bf8c05dec512d5476549c2497ec9c35726fb24c5cde40dc9b940bcc deviceinfo " diff --git a/device/testing/device-lg-m216/deviceinfo b/device/testing/device-lg-m216/deviceinfo index 7fa3116f7..63c08bdf1 100644 --- a/device/testing/device-lg-m216/deviceinfo +++ b/device/testing/device-lg-m216/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="LG K10 (m216)" deviceinfo_manufacturer="LG" deviceinfo_codename="lg-m216" deviceinfo_year="2016" -deviceinfo_dtb_mainline="qcom/msm8916-lg-m216" -deviceinfo_dtb_mainline_modem="qcom/msm8916-lg-m216-modem" +deviceinfo_dtb="qcom/msm8916-lg-m216" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm" deviceinfo_arch="aarch64" @@ -35,4 +34,3 @@ deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x01e00000" deviceinfo_flash_pagesize="2048" deviceinfo_flash_sparse="true" - diff --git a/device/testing/device-motorola-osprey/APKBUILD b/device/testing/device-motorola-osprey/APKBUILD index 37d4a1d8e..4e4dbbada 100644 --- a/device/testing/device-motorola-osprey/APKBUILD +++ b/device/testing/device-motorola-osprey/APKBUILD @@ -1,19 +1,19 @@ # Reference: pkgname=device-motorola-osprey -pkgver=4 +pkgver=5 pkgrel=0 pkgdesc="Motorola Moto G 3rd gen. (2015)" url="https://postmarketos.org" arch="aarch64" license="MIT" -depends="postmarketos-base mkbootimg soc-qcom-msm8916" +depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc" makedepends="devicepkg-dev" source="deviceinfo" options="!check !archcheck" +_pmb_select="soc-qcom-msm8916-rproc" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem:kernel_mainline_modem $pkgname-nonfree-firmware:nonfree_firmware " @@ -25,18 +25,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)" - depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" # osprey's wcnss-nv + venus firmware seems identical to harpia's :> @@ -46,5 +34,5 @@ nonfree_firmware() { } sha512sums=" -a1d9efde83357d62bb0fd271485eabeabe8689b92630da2578fd33d75bf15bb5e1c39527d1f1bae1835c54bf02372d0fd8980603f006b02df989bb82c3b0cac1 deviceinfo +8ab86eb16b1cd27d47ce4198252c16464ce8c8e239a24d076f1f985cd2dfae993e325e0d0e5d410b715966a78103cbec4c026f87272246f1d9cbfa31ea3cb7b1 deviceinfo " diff --git a/device/testing/device-motorola-osprey/deviceinfo b/device/testing/device-motorola-osprey/deviceinfo index bec98f012..85228091e 100644 --- a/device/testing/device-motorola-osprey/deviceinfo +++ b/device/testing/device-motorola-osprey/deviceinfo @@ -8,8 +8,7 @@ deviceinfo_codename="motorola-osprey" deviceinfo_year="2015" deviceinfo_chassis="handset" deviceinfo_keyboard="false" -deviceinfo_dtb_mainline="qcom/msm8916-motorola-osprey" -deviceinfo_dtb_mainline_modem="qcom/msm8916-motorola-osprey-modem" +deviceinfo_dtb="qcom/msm8916-motorola-osprey" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-motorola-osprey-inx" deviceinfo_external_storage="true"