From 34c32fe9580eddb088a693752a24f20e9e0efd33 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 9 Oct 2025 16:07:31 -0700 Subject: [PATCH] main/postmarketos-ui-os-installer: add support for os-installer 0.5.x There were a number of config changes in 0.5.x (vs 0.4.x), this updates our config to use the latest options/format. Note: language selection is enabled by default, so no need to list languages. Part-of: --- main/postmarketos-ui-os-installer/APKBUILD | 6 +-- .../rootfs-etc-os-installer-config.yaml | 41 ++++++++----------- .../rootfs-usr-bin-pmos_setup.sh | 4 +- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/main/postmarketos-ui-os-installer/APKBUILD b/main/postmarketos-ui-os-installer/APKBUILD index ab4ba4104..1a72c9584 100644 --- a/main/postmarketos-ui-os-installer/APKBUILD +++ b/main/postmarketos-ui-os-installer/APKBUILD @@ -1,7 +1,7 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Clayton Craft pkgname=postmarketos-ui-os-installer -pkgver=7 +pkgver=8 pkgrel=0 pkgdesc="UI for installing postmarketOS" url="https://gitlab.gnome.org/p3732/os-installer" @@ -97,12 +97,12 @@ e51733f5c75649206ec99b96486fc33419541dd8ff6fe2ccd9eb8cba0920a004c6190362342ecd94 5d43fcfbbcda66497067eb665537b2e38e77f335ba58989e6a24af35f10e07cf1d10ba47cd7536de87bcf60fdb5c8582c7a84b7ffaa0c47c964b0b7ae6c95cae rootfs-usr-lib-sysusers.d-os-installer.conf 1d3268d5eed453a31bcdea1a9d6525a2a6f2172c7a54bdf0fbe6f01d6dbec4d4e793e5cabb03f97e80ae98a6a6712fc0391a2a1f0c19cf59f0bf698c06b10ac7 rootfs-usr-lib-tmpfiles.d-os-installer.conf 59d50219457ad91f72efd2d0fd4edaad5af39bce50c4ae140074b1ad89c55b3ecb84f53db40afd83b73b9b1f11f8a7d1fb7685f247961fa6e1f32ef30c9d93da rootfs-usr-share-glib-2.0-schemas-00_postmarketos-ui-os-installer.gschema.override -2763f5588bac6fef3735f3c42dfaaa725cc4a5fdc3da7e4b1ab4407b251b8a5bf406beeb0762baedb07e7a2246f5ca2d5c4cccebfad60278f19de5b516e0fc7e rootfs-etc-os-installer-config.yaml +5d386ee5ec924fbed262ade6b1ac36c767632d2545af6b7252250f8b41ef27a829b618e7cba0f715fef9601e498b8eac91dbe096d69b6c44c02f326c264a75d7 rootfs-etc-os-installer-config.yaml 98984fd67b99400d2b08422c4d314da558d3c94ee67dbc895e7bbfd6fdf22d4b2c9d35f48f4b73b383a054f535d4089fb705c5532f034cb2ee54eab2184e8e86 rootfs-etc-os-installer-distro.svg de891dfc5a0ff9c5f6cb573e961116f7095169f59af4df258f60b0416b109f3a7c2105d3faf496eafdf4b1eee5e91d182df62a8bee98e162423b7f08dd5d684c rootfs-etc-os-installer-desktops-cosmic.png df78c6460836c50f1b3a379cd46e6c50168673f5a4f97083eedbb81de7c8f7a363f3ec4b3840252cb824fcb501ead0870356cf89c60638a460df2c95e324d445 rootfs-etc-os-installer-desktops-gnome.png d06026fd8cf2229257fb26b8a7f14ca6e3b7e3ad61b99c5795910f1a8de2a319c21f43cd192534529a5f565b7cf8c8ea8968667133bfeabe1b42ed5fafa81c92 rootfs-etc-os-installer-desktops-kde.png fefe277cd20c1f0b2d09f3646dbf8c771fa769a779860b6399efcdd63af83664e2cd431224a389f2df68c277dfd3d1e473924c377ba9d1ff3674d36ec5b0ebb2 rootfs-etc-os-installer-desktops-xfce.png 0dbf065c3410414021db4317103b87c1ca792d00418454bcc0d3784997a8bc8a1343fd974e3d8815bed952ea10eea7dfeda55e430a01d9b7bd765872e5ba04bd rootfs-etc-os-installer-desktops-console.png -e169532fa4ea681f5fce37d16257734147cb53debf2f372d6514dba489d596056ea01f49047844ad5f5df3621c9fdd21690f439eeb83ceaf988788b877fa2726 rootfs-usr-bin-pmos_setup.sh +91999cac84cf66a3116ef4c1ac827727cb9e4a2ddefe17bd872b27583c4c8abd6dc6b62ae07ef9b1ddb00b8f00275a334b580b38516224b45a11dc9cc3f9c32c rootfs-usr-bin-pmos_setup.sh " diff --git a/main/postmarketos-ui-os-installer/rootfs-etc-os-installer-config.yaml b/main/postmarketos-ui-os-installer/rootfs-etc-os-installer-config.yaml index 8d3b0922f..c25cb2a76 100644 --- a/main/postmarketos-ui-os-installer/rootfs-etc-os-installer-config.yaml +++ b/main/postmarketos-ui-os-installer/rootfs-etc-os-installer-config.yaml @@ -2,33 +2,25 @@ --- distribution_name: 'postmarketOS' -internet_connection_required: yes -internet_checker_url: 'http://networkcheck.postmarketos.org' +internet: + connection_required: yes + checker_url: 'http://networkcheck.postmarketos.org' -# Skip the language selection dialog by specifing a language, e.g. 'pt_BR' -# Default: no (No fixed language, not Norwegian) -fixed_language: no - -# A selection of languages the installer should present by default. -# Note: For a language to be available, it needs to be provided by the system -# and the installer needs to have a translation into that language. -# Default: ['ar', 'de', 'en', 'es', 'fr', 'ja', 'ru', 'zh'] -suggested_languages: - - 'ar' - - 'de' - - 'en' - - 'es' - - 'fr' - - 'ja' - - 'ru' - - 'zh' +scripts: + prepare: /etc/os-installer/scripts/prepare.sh + install: /etc/os-installer/scripts/install.sh + configure: /etc/os-installer/scripts/configure.sh welcome_page: logo : '/etc/os-installer/distro.svg' text : "Let's install postmarketOS!" usage : yes -minimum_disk_size: 5 # GB, probably enough for most UIs? +disk: + min_size: 5 # GB + # We don't support installing to a partition, so don't give users the option + # to select a single partition + partition_ok: no disk_encryption: offered: yes @@ -67,7 +59,7 @@ user: # gnome-initial-setup can handle user and locale setup. # These settings allow to disable these pages. skip_user: no -skip_locale: no +skip_region: no # additional_software: # - name : 'Firefox' @@ -88,6 +80,7 @@ skip_locale: no failure_help_url: 'https://wiki.postmarketos.org' -browser_cmd: 'firefox' -disks_cmd : 'gnome-disks' -wifi_cmd : 'gnome-control-center wifi' +commands: + browser: 'firefox' + disks: 'gnome-disks' + wifi: 'gnome-control-center wifi' diff --git a/main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh b/main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh index 42b211b45..8612502bc 100644 --- a/main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh +++ b/main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh @@ -47,7 +47,9 @@ do_configure() { # OSI_ADDITIONAL_FEATURES: Space-separated list of additional features chosen $pmb config user "$OSI_USER_USERNAME" - $pmb config timezone "$OSI_TIMEZONE" + # os-installer replaces underscores with spaces, but this breaks pmb if we use + # the value directly without switching spaces for underscores + $pmb config timezone "$(echo "$OSI_TIMEZONE" | tr ' ' '_')" fde_args="" if [ -n "$OSI_ENCRYPTION_PIN" ]; then