diff --git a/device/community/device-bq-paella/APKBUILD b/device/community/device-bq-paella/APKBUILD index e4691abed..9a2b1454a 100644 --- a/device/community/device-bq-paella/APKBUILD +++ b/device/community/device-bq-paella/APKBUILD @@ -3,20 +3,24 @@ # Co-Maintainer: Minecrell pkgname=device-bq-paella pkgdesc="BQ Aquaris X5" -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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -26,18 +30,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 @@ -47,5 +39,5 @@ nonfree_firmware() { } sha512sums=" -0d766c480ca6c5b0d91610fd33a1269b6ecf8a30fed4366ea1988bdc6398ee3a5a0551e20976a43913a636dc3e27d2e13a7960ae92cd4f268421654cd1a0aaad deviceinfo +9b52a7db71484e614b3f8efc5b4450dcbe93165f8372b22006f4c84f62cd243785f262f29d892feeb6bd59c92df6a649511eb1f58be56a0f6f1384e8a7320392 deviceinfo " diff --git a/device/community/device-bq-paella/deviceinfo b/device/community/device-bq-paella/deviceinfo index 7bd7fa571..77b7cb698 100644 --- a/device/community/device-bq-paella/deviceinfo +++ b/device/community/device-bq-paella/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="BQ Aquaris X5" deviceinfo_manufacturer="BQ" deviceinfo_codename="bq-paella" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-longcheer-l8910" -deviceinfo_dtb_mainline_modem="qcom/msm8916-longcheer-l8910-modem" +deviceinfo_dtb="qcom/msm8916-longcheer-l8910" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax_852xES" deviceinfo_arch="aarch64" diff --git a/device/community/device-lenovo-a6000/APKBUILD b/device/community/device-lenovo-a6000/APKBUILD index c70bd7224..fdf0ae34e 100644 --- a/device/community/device-lenovo-a6000/APKBUILD +++ b/device/community/device-lenovo-a6000/APKBUILD @@ -3,21 +3,25 @@ # Co-Maintainer: Minecrell pkgname=device-lenovo-a6000 pkgdesc="Lenovo A6000" -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 rootston.ini" 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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -27,18 +31,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 @@ -54,6 +46,6 @@ phosh() { } sha512sums=" -bc19a19e3f386f3c455de39808bb2b398b487a30b405cdfff7e118f7d5dbb528684abd609a50ce90ff4f9f239064fba462bb0bcfe1392bdc56fa8723e7863be0 deviceinfo +c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99 deviceinfo cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951 rootston.ini " diff --git a/device/community/device-lenovo-a6000/deviceinfo b/device/community/device-lenovo-a6000/deviceinfo index 60a4e7d06..1ed8b0bef 100644 --- a/device/community/device-lenovo-a6000/deviceinfo +++ b/device/community/device-lenovo-a6000/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Lenovo A6000" deviceinfo_manufacturer="Lenovo" deviceinfo_codename="lenovo-a6000" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-wingtech-wt86518" -deviceinfo_dtb_mainline_modem="qcom/msm8916-wingtech-wt86518-modem" +deviceinfo_dtb="qcom/msm8916-wingtech-wt86518" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06" deviceinfo_arch="aarch64" diff --git a/device/community/device-lenovo-a6010/APKBUILD b/device/community/device-lenovo-a6010/APKBUILD index 9179dbf6c..a50157d34 100644 --- a/device/community/device-lenovo-a6010/APKBUILD +++ b/device/community/device-lenovo-a6010/APKBUILD @@ -3,21 +3,25 @@ # Co-Maintainer: Minecrell pkgname=device-lenovo-a6010 pkgdesc="Lenovo A6010" -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 rootston.ini" 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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -27,18 +31,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 @@ -54,6 +46,6 @@ phosh() { } sha512sums=" -d02f0712741ef173022c61d6cf981c2742b6ce69bd124e2220dc041ab490b444eb1b4e82c56e44aabcf0cca85e54e82ded0d732b2ddf21f532fcb1db85c120c2 deviceinfo +f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75 deviceinfo cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951 rootston.ini " diff --git a/device/community/device-lenovo-a6010/deviceinfo b/device/community/device-lenovo-a6010/deviceinfo index 18235f1b6..fa2896ee8 100644 --- a/device/community/device-lenovo-a6010/deviceinfo +++ b/device/community/device-lenovo-a6010/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Lenovo A6010" deviceinfo_manufacturer="Lenovo" deviceinfo_codename="lenovo-a6010" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-wingtech-wt86528" -deviceinfo_dtb_mainline_modem="qcom/msm8916-wingtech-wt86528-modem" +deviceinfo_dtb="qcom/msm8916-wingtech-wt86528" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06" deviceinfo_arch="aarch64" diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD index de84ec3df..56584dc5b 100644 --- a/device/community/device-motorola-harpia/APKBUILD +++ b/device/community/device-motorola-harpia/APKBUILD @@ -3,21 +3,24 @@ # Co-Maintainer: Minecrell pkgname=device-motorola-harpia pkgdesc="Motorola Moto G4 Play" -pkgver=6 +pkgver=7 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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -27,18 +30,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 @@ -47,5 +38,5 @@ nonfree_firmware() { } sha512sums=" -9df7e817dd405d9c9a3e36ced7a1bff59c22ad449693ed28c6f18f23c29b43a609378d2356e674b6eca826933dffb09fece33d878c1988df2ea2278cab644af4 deviceinfo +9cf557543fe876ae42298c2e717298cd03888fadf2d43a2794b1c7b3e13310796a914d59fade9b5421fc3035fd4b69b94b0bb75d30c559386f0cbfee98300bc3 deviceinfo " diff --git a/device/community/device-motorola-harpia/deviceinfo b/device/community/device-motorola-harpia/deviceinfo index 7eeaf86d8..44ca257c9 100644 --- a/device/community/device-motorola-harpia/deviceinfo +++ b/device/community/device-motorola-harpia/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Motorola Moto G4 Play" deviceinfo_manufacturer="Motorola" deviceinfo_codename="motorola-harpia" deviceinfo_year="2016" -deviceinfo_dtb_mainline="qcom/msm8916-motorola-harpia" -deviceinfo_dtb_mainline_modem="qcom/msm8916-motorola-harpia-modem" +deviceinfo_dtb="qcom/msm8916-motorola-harpia" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-motorola-harpia-boe panel-motorola-harpia-tianma msm rmi-i2c" deviceinfo_arch="aarch64" diff --git a/device/community/device-samsung-a3/APKBUILD b/device/community/device-samsung-a3/APKBUILD index 20bf28d82..02a7c7206 100644 --- a/device/community/device-samsung-a3/APKBUILD +++ b/device/community/device-samsung-a3/APKBUILD @@ -4,25 +4,26 @@ # Co-Maintainer: Minecrell pkgname=device-samsung-a3 pkgdesc="Samsung Galaxy A3 (2015)" -pkgver=6 +pkgver=7 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 rootston.ini" 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" -# Backwards compatibility for old device package names +# Backwards compatibility for old device package names + kernel variants _substitutes="device-samsung-a3lte device-samsung-a3ulte" -replaces="$_substitutes" +replaces="$_substitutes $pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline $pkg-kernel-mainline-modem"; done for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { @@ -33,24 +34,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - 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" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline-modem"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a3-wcnss-nv" @@ -70,6 +53,6 @@ phosh() { } sha512sums=" -35999e456ef4035d5ec67f04b159f830fa2ffff6f815925714b8a47d10cd0eb245207b1551808521786657403b1140ddc649c7f15b18ad6091fcbd31f53ee275 deviceinfo +dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509 deviceinfo f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83 rootston.ini " diff --git a/device/community/device-samsung-a3/deviceinfo b/device/community/device-samsung-a3/deviceinfo index 8ea376446..803858a81 100644 --- a/device/community/device-samsung-a3/deviceinfo +++ b/device/community/device-samsung-a3/deviceinfo @@ -8,8 +8,7 @@ deviceinfo_codename="samsung-a3" deviceinfo_year="2014" # All A3 variants seem to use mostly the same hardware so using a3u-eur works. -deviceinfo_dtb_mainline="qcom/msm8916-samsung-a3u-eur" -deviceinfo_dtb_mainline_modem="qcom/msm8916-samsung-a3u-eur-modem" +deviceinfo_dtb="qcom/msm8916-samsung-a3u-eur" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams452ef01 msm zinitix" deviceinfo_arch="aarch64" diff --git a/device/community/device-samsung-a5/APKBUILD b/device/community/device-samsung-a5/APKBUILD index 3f6f3a7e1..e59c77ce7 100644 --- a/device/community/device-samsung-a5/APKBUILD +++ b/device/community/device-samsung-a5/APKBUILD @@ -3,24 +3,25 @@ # Co-Maintainer: Alexey Min pkgname=device-samsung-a5 pkgdesc="Samsung Galaxy A5 (2015)" -pkgver=6 +pkgver=7 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" -# Backwards compatibility for old device package names +# Backwards compatibility for old device package names + kernel variants _substitutes="device-samsung-a5lte device-samsung-a5ulte" -replaces="$_substitutes" +replaces="$_substitutes $pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline $pkg-kernel-mainline-modem"; done for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { @@ -31,24 +32,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - 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" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline-modem"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a5-wcnss-nv" @@ -59,5 +42,5 @@ nonfree_firmware() { } sha512sums=" -8159d38ec4e9b85ca929de9cd6888475e596b64c73b9c2bedf68e2d21434448fc0d40d6aa3a5aa1d3da767d34557f0691bae7d0802239872fdf5bbb810664dab deviceinfo +ee496db47c95cb67b502c5f11d7390b679fbc8fc011eab1f9d7639b5df02c01501cb9963f638adaed93e6626a23e15be6d53b093f2b55f7d19108d06277939f7 deviceinfo " diff --git a/device/community/device-samsung-a5/deviceinfo b/device/community/device-samsung-a5/deviceinfo index d5191040d..d831f7985 100644 --- a/device/community/device-samsung-a5/deviceinfo +++ b/device/community/device-samsung-a5/deviceinfo @@ -8,8 +8,7 @@ deviceinfo_codename="samsung-a5" deviceinfo_year="2015" # Eventually this should be replaced with a special DTB for a5lte. # However, the differences are minimal, so for now a5u-eur works fine. -deviceinfo_dtb_mainline="qcom/msm8916-samsung-a5u-eur" -deviceinfo_dtb_mainline_modem="qcom/msm8916-samsung-a5u-eur-modem" +deviceinfo_dtb="qcom/msm8916-samsung-a5u-eur" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-samsung-ea8061v-ams497ee01 msm mms114" deviceinfo_arch="aarch64" diff --git a/device/community/device-samsung-gt510/APKBUILD b/device/community/device-samsung-gt510/APKBUILD index 61090b54c..79e2263e6 100644 --- a/device/community/device-samsung-gt510/APKBUILD +++ b/device/community/device-samsung-gt510/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: Nikita Travkin pkgname=device-samsung-gt510 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)" -pkgver=2 +pkgver=3 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 @@ -16,11 +17,14 @@ source=" rootston.ini " subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem-lte:kernel_mainline_modem_lte $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh " +_pmb_select="soc-qcom-msm8916-rproc" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem-lte" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -33,18 +37,6 @@ package() { "$pkgdir"/etc/pointercal } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly, use for all variants)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem_lte() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP, for LTE variant)" - 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-samsung-gt510-wcnss-nv" @@ -58,7 +50,7 @@ phosh() { } sha512sums=" -e441a875457ee6dc8822df7a89cd08522af0b03c2dc8f9adc1f9d969297a0507f96defae425899c1248c659e7be418afd677c16a171a836ecda551b3c2148955 deviceinfo +5acddf5145a0ec2cbe056bd120b1413fd6efee441f15127ce6f132ab470f326ba729f71afc70ba4d8dc9dab62e49fa20217632f08f9ed6d5b2ddda033ed32009 deviceinfo 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5 pointercal bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180 rootston.ini " diff --git a/device/community/device-samsung-gt510/deviceinfo b/device/community/device-samsung-gt510/deviceinfo index b6cdecad8..9e8fa999a 100644 --- a/device/community/device-samsung-gt510/deviceinfo +++ b/device/community/device-samsung-gt510/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Samsung Galaxy Tab A 9.7 (2015)" deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-gt510" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-samsung-gt510" -deviceinfo_dtb_mainline_modem_lte="qcom/msm8916-samsung-gt510lte-modem" +deviceinfo_dtb="qcom/msm8916-samsung-gt510" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-samsung-s6d7aa0-ltl101at01 msm atmel_mxt_ts" deviceinfo_arch="aarch64" diff --git a/device/community/device-samsung-gt58/APKBUILD b/device/community/device-samsung-gt58/APKBUILD index e32df97f3..9afd38036 100644 --- a/device/community/device-samsung-gt58/APKBUILD +++ b/device/community/device-samsung-gt58/APKBUILD @@ -2,24 +2,28 @@ # Maintainer: Nikita Travkin pkgname=device-samsung-gt58 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)" -pkgver=2 +pkgver=3 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 dtbtool" source=" deviceinfo rootston.ini " subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-mainline-modem-lte:kernel_mainline_modem_lte $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh " +_pmb_select="soc-qcom-msm8916-rproc" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem-lte" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -29,18 +33,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly, for all variants)" - depends="linux-postmarketos-qcom-msm8916" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline_modem_lte() { - pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP, for LTE variant)" - 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-samsung-gt58-wcnss-nv" @@ -54,6 +46,6 @@ phosh() { } sha512sums=" -47b4a546ecdca8b61235290219b6c7d950ce3163cd0de2ded2648f2c4f2151ef1efcfa4c8c25774a69b99d77ae29c4dcb9d59995b9d0e82f380318c5c9d095c0 deviceinfo +b374fc9b75b0693a27c94116f652410a0b026077beba91527104fd0e3e720ddec0c1e48b54714af810b514571d5f2021f8facf34a9ea8de35b92aa060af64d19 deviceinfo bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180 rootston.ini " diff --git a/device/community/device-samsung-gt58/deviceinfo b/device/community/device-samsung-gt58/deviceinfo index 44eaa1cfc..6135d3ea9 100644 --- a/device/community/device-samsung-gt58/deviceinfo +++ b/device/community/device-samsung-gt58/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Samsung Galaxy Tab A 8.0 (2015)" deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-gt58" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-samsung-gt58" -deviceinfo_dtb_mainline_modem_lte="qcom/msm8916-samsung-gt58lte-modem" +deviceinfo_dtb="qcom/msm8916-samsung-gt58" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-samsung-s6d7aa0-lsl080al03 msm zinitix" deviceinfo_arch="aarch64" diff --git a/device/community/device-samsung-serranove/APKBUILD b/device/community/device-samsung-serranove/APKBUILD index 8507b548c..1159f399c 100644 --- a/device/community/device-samsung-serranove/APKBUILD +++ b/device/community/device-samsung-serranove/APKBUILD @@ -2,24 +2,27 @@ # Maintainer: Minecrell pkgname=device-samsung-serranove pkgdesc="Samsung Galaxy S4 Mini Value Edition" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" 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 rootston.ini" 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" + +# Backwards compatibility for old device package names + kernel variants _substitutes="device-samsung-serranovelte" -replaces="$_substitutes" -provides="$replaces=$pkgver-r$pkgrel" +replaces="$_substitutes $pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline $pkg-kernel-mainline-modem"; done +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -29,22 +32,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_mainline() { - pkgdesc="Close to mainline kernel (no modem, audio routed directly)" - depends="linux-postmarketos-qcom-msm8916" - replaces="$_substitutes-kernel-mainline" - provides="$replaces=$pkgver-r$pkgrel" - 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" - replaces="$_substitutes-kernel-mainline-modem" - provides="$replaces=$pkgver-r$pkgrel" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-serranove-wcnss-nv" @@ -62,6 +49,6 @@ phosh() { } sha512sums=" -b0f7f042e48b664837bae2251ee2bec21dd9ce916da6f5a5cf1fbc2f4b158e4e035cb317a89fd522394e33c1bb079be2eedb13358fb789a04cd61f62798c1d8f deviceinfo +a9012f626cd3f830ebc02b44e744e8684a20cdfbf7b2e27ae0bc9830d3a575f78256e2bc505f8d61de2eaa83726313c6fc9dde2b86dcd6cc3ab1fd3bd100012c deviceinfo 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea rootston.ini " diff --git a/device/community/device-samsung-serranove/deviceinfo b/device/community/device-samsung-serranove/deviceinfo index 16c3b20d8..4eb21ef7e 100644 --- a/device/community/device-samsung-serranove/deviceinfo +++ b/device/community/device-samsung-serranove/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Samsung Galaxy S4 Mini Value Edition" deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-serranove" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom-msm8916-samsung-serranovelte" -deviceinfo_dtb_mainline_modem="qcom-msm8916-samsung-serranovelte-modem" +deviceinfo_dtb="qcom-msm8916-samsung-serranovelte" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams427ap24 msm zinitix" deviceinfo_arch="armv7" diff --git a/device/community/device-wileyfox-crackling/APKBUILD b/device/community/device-wileyfox-crackling/APKBUILD index afac2e1c7..57805607a 100644 --- a/device/community/device-wileyfox-crackling/APKBUILD +++ b/device/community/device-wileyfox-crackling/APKBUILD @@ -3,20 +3,24 @@ # Co-Maintainer: Minecrell pkgname=device-wileyfox-crackling pkgdesc="Wileyfox Swift" -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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -26,18 +30,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 @@ -46,5 +38,5 @@ nonfree_firmware() { } sha512sums=" -5991cc4af411af56b07621e84cd0613b71effad482bd18a4a96ff80e432bac2b78b3d1613a761eff5fa6fcd26b12b9f48f52f0acf76c1fcc5d82182d72e13487 deviceinfo +e30325a138f70c3e3aa5e9ebceec6f032f2641c06c00ce5b55b9e3024b7c2d8dc35e75d0dc77d24c61810bcf864e34004d96a22a69808949f01db513fa85d776 deviceinfo " diff --git a/device/community/device-wileyfox-crackling/deviceinfo b/device/community/device-wileyfox-crackling/deviceinfo index 058f24d77..a17249715 100644 --- a/device/community/device-wileyfox-crackling/deviceinfo +++ b/device/community/device-wileyfox-crackling/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Wileyfox Swift" deviceinfo_manufacturer="Wileyfox" deviceinfo_codename="wileyfox-crackling" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-longcheer-l8150" -deviceinfo_dtb_mainline_modem="qcom/msm8916-longcheer-l8150-modem" +deviceinfo_dtb="qcom/msm8916-longcheer-l8150" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-longcheer-booyi-otm1287 msm rmi-i2c" deviceinfo_arch="aarch64" diff --git a/device/community/device-xiaomi-wt88047/APKBUILD b/device/community/device-xiaomi-wt88047/APKBUILD index a7213ac7d..ad98018df 100644 --- a/device/community/device-xiaomi-wt88047/APKBUILD +++ b/device/community/device-xiaomi-wt88047/APKBUILD @@ -2,20 +2,24 @@ # Maintainer: Minecrell pkgname=device-xiaomi-wt88047 pkgdesc="Xiaomi Redmi 2" -pkgver=6 +pkgver=7 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" + +# Backwards compatibility for old kernel variant subpackages +replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" +for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -25,20 +29,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" - replaces="$subpkgname-wt86047 $subpkgname-wt88047" - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Modem/Video firmware" depends="firmware-qcom-adreno-a300 msm-firmware-loader @@ -48,5 +38,5 @@ nonfree_firmware() { } sha512sums=" -ae3d5a33bcc544b89910e79347745bda3ca638261fab4ecebeb4026a2dab61684db8aee1c33468b8f2211c7761336d43547a2868f6db9f1a6a26fb961d7e4804 deviceinfo +f6ea75ff0ad533dbd78e578cf6c77d0784a4629f69f66aff88743f20f1dec1013d0a456e755b7a361fa58f80630ba82f964c5092d5f5192fdc9548c31ebbe5aa deviceinfo " diff --git a/device/community/device-xiaomi-wt88047/deviceinfo b/device/community/device-xiaomi-wt88047/deviceinfo index cd0efdca5..6f616ebfc 100644 --- a/device/community/device-xiaomi-wt88047/deviceinfo +++ b/device/community/device-xiaomi-wt88047/deviceinfo @@ -6,8 +6,7 @@ deviceinfo_name="Xiaomi Redmi 2" deviceinfo_manufacturer="Xiaomi" deviceinfo_codename="xiaomi-wt88047" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom/msm8916-wingtech-wt88047" -deviceinfo_dtb_mainline_modem="qcom/msm8916-wingtech-wt88047-modem" +deviceinfo_dtb="qcom/msm8916-wingtech-wt88047" deviceinfo_append_dtb="true" deviceinfo_modules_initfs="smb1360 panel-wingtech-auo-r61308 panel-wingtech-boe-nt35521s panel-wingtech-ebbg-otm1285a panel-wingtech-sharp-r69431 msm edt-ft5x06" deviceinfo_arch="aarch64"