phoc only loads one config file, with `/etc/phoc.ini` overriding `/usr/share/phosh/phoc.ini`.
Because `/usr/share/phosh/phoc.ini` only contains defaults, it is safe to override with the
device's phoc.ini and free up `/etc/phoc.ini` for user configs. If a user has modified
`/etc/phoc.ini` on their install, it will not be removed, making this change safe.
Also does various small cleanups, like setting the `install_if` to `postmarketos-ui-phosh`
instead of plain `phosh`.
Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8845>
[Warning!] deviceinfo_append_dtb: Property is set to its default value (false) and can be removed.
[Warning!] deviceinfo_append_dtb_lts: Property is set to its default value (false) and can be removed.
[Warning!] deviceinfo_append_dtb_exynos4: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_append_dtb\(_.*\)\?="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_external_storage: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_external_storage="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_disable_dhcpd: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_disable_dhcpd="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_bootimg_qcdt: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_bootimg_qcdt="false"/d' device/*/*/deviceinfo
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8035>
A large scripted cleanup to fix the errors, each with the sed command
used.
**Renamed variables**
[Error!!!] deviceinfo_gpu_accelerated: gpu_accelerated was renamed to drm: More accurately describes its function; see pmaports#1481 for the reasoning.
sed -i 's/^deviceinfo_gpu_accelerated=/deviceinfo_drm=/' device/*/*/deviceinfo
[Error!!!] deviceinfo_flash_heimdall_partition_system: flash_heimdall_partition_system was renamed to flash_heimdall_partition_rootfs: Renamed to avoid confusion
sed -i 's/^deviceinfo_flash_heimdall_partition_system=/deviceinfo_flash_heimdall_partition_rootfs=/' device/*/*/deviceinfo
[Error!!!] deviceinfo_flash_fastboot_partition_system: flash_fastboot_partition_system was renamed to flash_fastboot_partition_rootfs: Renamed to avoid confusion
sed -i 's/^deviceinfo_flash_fastboot_partition_system=/deviceinfo_flash_fastboot_partition_rootfs=/' device/*/*/deviceinfo
**Obsolete variables**
[Error!!!] deviceinfo_keyboard: This property is obsolete: Programs should automatically detect if the device currently has a keyboard or not (often it can be hotplugged anyway).
sed -i '/^deviceinfo_keyboard=/d' device/*/*/deviceinfo
[Error!!!] deviceinfo_framebuffer_landscape: This property is obsolete: Removed by the switch to pbsplash with no apparent replacement
sed -i '/^deviceinfo_framebuffer_landscape=/d' device/*/*/deviceinfo
[Error!!!] deviceinfo_mesa_driver: This property is obsolete: This was used by osk-sdl, which has been replaced by unl0kr.
sed -i '/^deviceinfo_mesa_driver=/d' device/*/*/deviceinfo
**Default values**
[Warning!] deviceinfo_flash_method: Property is set to its default value ("none") and can be removed.
sed -i '/^deviceinfo_flash_method="none"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_drm: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_drm="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_bootimg_dtb_second: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_bootimg_dtb_second="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_generate_bootimg: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_generate_bootimg="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_heimdall_partition_rootfs: Property is set to its default value ("SYSTEM") and can be removed.
sed -i '/^deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_heimdall_partition_kernel: Property is set to its default value ("KERNEL") and can be removed.
sed -i '/^deviceinfo_flash_heimdall_partition_kernel="KERNEL"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_heimdall_partition_initfs: Property is set to its default value ("RECOVERY") and can be removed.
sed -i '/^deviceinfo_flash_heimdall_partition_initfs="RECOVERY"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_offset_base: Property is set to its default value ("0x10000000") and can be removed.
sed -i '/^deviceinfo_flash_offset_base="0x10000000"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_kernel_on_update: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_flash_kernel_on_update="false"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_fastboot_partition_rootfs: Property is set to its default value ("userdata") and can be removed.
sed -i '/^deviceinfo_flash_fastboot_partition_rootfs="userdata"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_flash_fastboot_partition_kernel: Property is set to its default value ("boot") and can be removed.
sed -i '/^deviceinfo_flash_fastboot_partition_kernel="boot"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_partition_type: Property is set to its default value ("gpt") and can be removed.
sed -i '/^deviceinfo_partition_type="gpt"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_sd_embed_firmware_step_size: Property is set to its default value (1024) and can be removed.
sed -i '/^deviceinfo_sd_embed_firmware_step_size="1024"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_boot_part_start: Property is set to its default value (2048) and can be removed.
sed -i '/^deviceinfo_boot_part_start="2048"/d' device/*/*/deviceinfo
[Warning!] deviceinfo_generate_legacy_uboot_initfs: Property is set to its default value (false) and can be removed.
sed -i '/^deviceinfo_generate_legacy_uboot_initfs="false"/d' device/*/*/deviceinfo
All were bumped using "pmbootstrap pkgver_bump".
[ci:ignore-count]
[ci:skip-build]: already built successfully in CI
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7403>
This cmdline argument is now a no-op. Drop it everywhere and add a new
CI check to enforce this.
Adjust the deprecated "minimal" initramfs variant to use
pmos.debug-shell to enable logging instead. It doesn't /support/
dropping to a shell, so the variable takes on a different meaning. But
that's ok since it's at least more consistent.
[ci:ignore-count]
[ci:skip-vercheck]
Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
Tweaked-by: Oliver Smith <ollieparanoid@postmarketos.org>
[ci:skip-build]: kernel builds are very likely to go through now
Package was removed and is now included in boot-deploy.
[ci:ignore-count]: Lots of packages intentionally changed.
[ci:skip-build]: already built successfully in CI
Aster Boese