Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

flashers: heimdall-isorec: use heimdall_flash_isorec_kernel.sh (MR 2360)

Browse source 
This wrapper script, which was added in alpinelinux's heimdall 2.1.0
package, replaces heimdall_flash_kernel.sh and takes a fifth arg with
dtb name. The script then concatenates vmlinuz and the dtb into a
vmlinuz-dtb file and flashes it to the kernel partition.

Boot-deploy was previously responsible for creating vmlinuz-dtb, but
to save disk space we have moved away from creating it
unconditionally.

Fixes: https://gitlab.com/postmarketOS/boot-deploy/-/issues/26
This commit is contained in:
Henrik Grimler 2024-07-09 22:10:23 +02:00 • committed by Oliver Smith
parent 32541b2141
commit dd4eb60241
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pmb/config/__init__.py
View file

@ -356,7 +356,7 @@ flash_mount_bind = [
Flasher abstraction. Allowed variables: Flasher abstraction. Allowed variables:
$BOOT: Path to the /boot partition $BOOT: Path to the /boot partition
$DTB: Set to "-dtb" if deviceinfo_append_dtb is set, otherwise "" $DTB: Name of device dtb without .dtb extension
$FLAVOR: Backwards compatibility with old mkinitfs (pma#660) $FLAVOR: Backwards compatibility with old mkinitfs (pma#660)
$IMAGE: Path to the combined boot/rootfs image $IMAGE: Path to the combined boot/rootfs image
$IMAGE_SPLIT_BOOT: Path to the (split) boot image $IMAGE_SPLIT_BOOT: Path to the (split) boot image
@ -425,11 +425,12 @@ flashers: dict[str, dict[str, bool | list[str] | dict[str, list[list[str]]]]] =
], ],
"flash_kernel": [ "flash_kernel": [
[ [
"heimdall_flash_kernel.sh", "heimdall_flash_isorec_kernel.sh",
"$BOOT/initramfs$FLAVOR", "$BOOT/initramfs$FLAVOR",
"$PARTITION_INITFS", "$PARTITION_INITFS",
"$BOOT/vmlinuz$FLAVOR$DTB", "$BOOT/vmlinuz$FLAVOR",
"$PARTITION_KERNEL", "$PARTITION_KERNEL",
"$BOOT/$DTB",
] ]
], ],
}, },

4
pmb/flasher/variables.py
View file

@ -62,9 +62,7 @@ def variables(args: PmbArgs, flavor: str, method: str):
_partition_vbmeta = args.partition _partition_vbmeta = args.partition
_partition_dtbo = args.partition _partition_dtbo = args.partition
_dtb = "" _dtb = deviceinfo.dtb + ".dtb"
if deviceinfo.append_dtb == "true":
_dtb = "-dtb"
_no_reboot = "" _no_reboot = ""
if getattr(args, "no_reboot", False): if getattr(args, "no_reboot", False):