From 68fe7df04619fbbb945f757a96e4f29fb7a94164 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 11 Jul 2021 18:17:21 +0200 Subject: [PATCH] pmbootstrap install: support new ondev boot label (MR 2083) In order to support FAT32 as boot partition, the label is shortened from pmOS_inst_boot to pmOS_i_boot. Read the value from pmaports.cfg and fall back to the old value, so both are supported (-> building v21.06 and v21.03 will use the old label). Remove the old codepath that would set "pmOS_boot" as label for the install partition, if the postmarketos-ondev package was older than 0.4.0. This is only the case on the long unsupported v20.05 branch. --- pmb/install/_install.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmb/install/_install.py b/pmb/install/_install.py index 3f19b9d6..a28f21d3 100644 --- a/pmb/install/_install.py +++ b/pmb/install/_install.py @@ -776,9 +776,9 @@ def install_on_device_installer(args, step, steps): # Generate installer image size_reserve = round(os.path.getsize(img_path_dest) / 1024 / 1024) + 200 - boot_label = "pmOS_inst_boot" - if pmb.parse.version.compare(get_ondev_pkgver(args), "0.4.0") == -1: - boot_label = "pmOS_boot" + pmaports_cfg = pmb.config.pmaports.read_config(args) + boot_label = pmaports_cfg.get("supported_install_boot_label", + "pmOS_inst_boot") install_system_image(args, size_reserve, suffix_installer, step, steps, boot_label, "pmOS_install", args.split, args.sdcard)