diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index 2cb61d136..c5a93eba7 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -3,8 +3,8 @@ pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" -pkgver=9 -pkgrel=1 +pkgver=10 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -21,10 +21,9 @@ depends=" makedepends="devicepkg-dev" source=" deviceinfo - phoc.ini q6voiced.conf " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -43,14 +42,7 @@ nonfree_firmware() { install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced } -phosh() { - install_if="$pkgname=$pkgver-r$pkgrel phosh" - install -Dm644 "$srcdir"/phoc.ini \ - "$subpkgdir"/etc/phosh/phoc.ini -} - sha512sums=" -6dd8948f6c23b35c60aa82c4db40b3c2aa766aa2cc53c84d86028f54cc2303201a80d70fe8830cd746f01a8ea2459f55ebbc2412c2e222a7e9e9e1649d9505a5 deviceinfo -65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38 phoc.ini +5a1771d1c2c70ae18e1ae11fe94617c5899995c3848c38f359232d587c076f36fb159bd654cfea0510a343e44c50b39d20148e650b1cbb3629d6fdc371ad8dc5 deviceinfo fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887 q6voiced.conf " diff --git a/device/community/device-oneplus-enchilada/deviceinfo b/device/community/device-oneplus-enchilada/deviceinfo index 94ad3c6b7..3b88b7c88 100644 --- a/device/community/device-oneplus-enchilada/deviceinfo +++ b/device/community/device-oneplus-enchilada/deviceinfo @@ -18,7 +18,7 @@ deviceinfo_screen_height="2280" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="quiet loglevel=2 console=null" +deviceinfo_kernel_cmdline="console=null" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" @@ -34,10 +34,11 @@ deviceinfo_flash_sparse="true" deviceinfo_dtb="qcom/sdm845-oneplus-enchilada" deviceinfo_append_dtb="true" deviceinfo_flash_kernel_on_update="true" +deviceinfo_initfs_compression="zstd:fast" # Required for devices using UFS as storage (instead of e.g. eMMC) deviceinfo_rootfs_image_sector_size="4096" # osk-sdl -deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics" +deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics" deviceinfo_mesa_driver="msm" diff --git a/device/community/device-oneplus-enchilada/phoc.ini b/device/community/device-oneplus-enchilada/phoc.ini deleted file mode 100644 index 3a87626f2..000000000 --- a/device/community/device-oneplus-enchilada/phoc.ini +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/phosh/phoc.ini -# Overwrites values set in /usr/share/phosh/phoc.ini - -[output:DSI-1] -scale = 3.0 diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD index c5f47fec6..20ebf0815 100644 --- a/device/community/device-oneplus-fajita/APKBUILD +++ b/device/community/device-oneplus-fajita/APKBUILD @@ -3,8 +3,8 @@ pkgname=device-oneplus-fajita pkgdesc="OnePlus 6T" -pkgver=9 -pkgrel=1 +pkgver=10 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -21,10 +21,9 @@ depends=" makedepends="devicepkg-dev" source=" deviceinfo - phoc.ini q6voiced.conf " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -43,14 +42,7 @@ nonfree_firmware() { install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced } -phosh() { - install_if="$pkgname=$pkgver-r$pkgrel phosh" - install -Dm644 "$srcdir"/phoc.ini \ - "$subpkgdir"/etc/phosh/phoc.ini -} - sha512sums=" -c3fe684bcd731c43837a6c1d53d8cb171fbf8e90f6d9fb99bd50c60bc18fbfae46b4e0623e4e841b9c7b0988e16282b9abf5927b09c54e85c8b632d858de68e4 deviceinfo -65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38 phoc.ini +6884b6911cebea9a4ee9926b9af8a5670a298535abb774e935a780d7939a1956dfe23e5f596e442a75d62cba1083b4c85a2d657f16f2fc48b9d68e833af74f71 deviceinfo fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887 q6voiced.conf " diff --git a/device/community/device-oneplus-fajita/deviceinfo b/device/community/device-oneplus-fajita/deviceinfo index 28fe9cc73..a115e30e4 100644 --- a/device/community/device-oneplus-fajita/deviceinfo +++ b/device/community/device-oneplus-fajita/deviceinfo @@ -18,7 +18,7 @@ deviceinfo_screen_height="2340" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="quiet loglevel=2 console=null" +deviceinfo_kernel_cmdline="console=null" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" @@ -34,10 +34,11 @@ deviceinfo_flash_sparse="true" deviceinfo_dtb="qcom/sdm845-oneplus-fajita" deviceinfo_append_dtb="true" deviceinfo_flash_kernel_on_update="true" +deviceinfo_initfs_compression="zstd:fast" # Required for devices using UFS as storage (instead of e.g. eMMC) deviceinfo_rootfs_image_sector_size="4096" # osk-sdl -deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics" +deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics" deviceinfo_mesa_driver="msm" diff --git a/device/community/device-oneplus-fajita/phoc.ini b/device/community/device-oneplus-fajita/phoc.ini deleted file mode 100644 index 3a87626f2..000000000 --- a/device/community/device-oneplus-fajita/phoc.ini +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/phosh/phoc.ini -# Overwrites values set in /usr/share/phosh/phoc.ini - -[output:DSI-1] -scale = 3.0 diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index e4993d9ce..17ec6479b 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -24,13 +24,9 @@ depends=" makedepends="devicepkg-dev" source=" deviceinfo - phoc.ini q6voiced.conf " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-phosh -" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -49,14 +45,7 @@ nonfree_firmware() { install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced } -phosh() { - install_if="$pkgname=$pkgver-r$pkgrel phosh" - install -Dm644 "$srcdir"/phoc.ini \ - "$subpkgdir"/etc/phosh/phoc.ini -} - sha512sums=" -baaa2434b61337b82362c9cbe8e1d26a8d22ccf9aeb0a15f281c0fa241ded9304ff4daf53bc6de10abe7d01ae3613cde95fcba23ab817f6ccd66a66bc30c960f deviceinfo -65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38 phoc.ini +a5386915a0cbbb4db39d36a277e3965b6c6aae820b8cd9db2b7f6b644d10f078aa8de42b6263e9584299bd002ddd2ee651f0723cdeb93692b03ebaec0b681e44 deviceinfo 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51 q6voiced.conf " diff --git a/device/community/device-shift-axolotl/deviceinfo b/device/community/device-shift-axolotl/deviceinfo index dc59c47e7..2bfd71f64 100644 --- a/device/community/device-shift-axolotl/deviceinfo +++ b/device/community/device-shift-axolotl/deviceinfo @@ -20,7 +20,7 @@ deviceinfo_screen_height="2160" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="quiet loglevel=2 console=null" +deviceinfo_kernel_cmdline="console=null" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" @@ -36,9 +36,10 @@ deviceinfo_flash_sparse="true" deviceinfo_append_dtb="true" deviceinfo_dtb="qcom/sdm845-shift-axolotl" deviceinfo_flash_kernel_on_update="true" +deviceinfo_initfs_compression="zstd:fast" # Required for devices using UFS as storage (instead of e.g. eMMC) deviceinfo_rootfs_image_sector_size="4096" deviceinfo_super_partitions="/dev/sda7 /dev/sda7" -deviceinfo_modules_initfs="edt-ft5x06 gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg qcom_spmi_haptics" +deviceinfo_modules_initfs="edt-ft5x06 gpi i2c_qcom_geni qcom_spmi_haptics" diff --git a/device/community/device-shift-axolotl/phoc.ini b/device/community/device-shift-axolotl/phoc.ini deleted file mode 100644 index 3a87626f2..000000000 --- a/device/community/device-shift-axolotl/phoc.ini +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/phosh/phoc.ini -# Overwrites values set in /usr/share/phosh/phoc.ini - -[output:DSI-1] -scale = 3.0 diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD index a0b6aaac3..914ebfd6f 100644 --- a/device/community/device-xiaomi-beryllium/APKBUILD +++ b/device/community/device-xiaomi-beryllium/APKBUILD @@ -3,8 +3,8 @@ # Reference: pkgname=device-xiaomi-beryllium pkgdesc="Xiaomi Poco F1" -pkgver=8 -pkgrel=1 +pkgver=9 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -21,12 +21,10 @@ subpackages=" $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-tianma:kernel_tianma $pkgname-kernel-ebbg:kernel_ebbg - $pkgname-phosh " source=" deviceinfo - phoc.ini q6voiced.conf " @@ -59,14 +57,7 @@ kernel_ebbg() { devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } -phosh() { - install_if="$pkgname=$pkgver-r$pkgrel phosh" - install -Dm644 "$srcdir"/phoc.ini \ - "$subpkgdir"/etc/phosh/phoc.ini -} - sha512sums=" -399e430a7340755c39680e436141dc141b38669791664bfb6d902bf4994516305fdf3e0e088717f60dc24faf64e0993c8695572f1afb7875a46548f494fdb54d deviceinfo -e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c phoc.ini +9a0048d9ee571e821ccaf190942e7db900ae0f636dd5d30bcf4211ed57f25988adc017ef353c205d55f73d75aa48b6f67b59d84b56a6a00448a94ae137bdb00a deviceinfo 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf " diff --git a/device/community/device-xiaomi-beryllium/deviceinfo b/device/community/device-xiaomi-beryllium/deviceinfo index 82ae43f1c..230cfb292 100644 --- a/device/community/device-xiaomi-beryllium/deviceinfo +++ b/device/community/device-xiaomi-beryllium/deviceinfo @@ -35,6 +35,7 @@ deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="4096" deviceinfo_flash_sparse="true" +deviceinfo_initfs_compression="zstd:fast" # osk-sdl deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg nt36xxx" diff --git a/device/community/device-xiaomi-beryllium/phoc.ini b/device/community/device-xiaomi-beryllium/phoc.ini deleted file mode 100644 index 59213ee6e..000000000 --- a/device/community/device-xiaomi-beryllium/phoc.ini +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/phosh/phoc.ini -# Overwrites values set in /usr/share/phosh/phoc.ini - -[output:DSI-1] -scale = 3