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

Add possibility to specify the system partition name for heimdall flashing method (#537)

Browse source 
Also added default values for the others heimdall partitions:
 kernel => KERNEL
 initfs => RECOVERY
 system => SYSTEM
This commit is contained in:
drebrez 2017-09-09 15:53:06 +02:00 • committed by Oliver Smith
parent bed1eacbb5
commit e421313632
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pmb/config/__init__.py
View file

@ -179,8 +179,9 @@ deviceinfo_attributes = [
# flash # flash
"generate_bootimg", "generate_bootimg",
"generate_legacy_uboot_initfs", "generate_legacy_uboot_initfs",
"flash_heimdall_partition_initfs",
"flash_heimdall_partition_kernel", "flash_heimdall_partition_kernel",
"flash_heimdall_partition_initfs",
"flash_heimdall_partition_system",
"flash_offset_base", "flash_offset_base",
"flash_offset_kernel", "flash_offset_kernel",
"flash_offset_ramdisk", "flash_offset_ramdisk",
@ -243,7 +244,7 @@ $FLAVOR: Kernel flavor
$IMAGE: Path to the system partition image $IMAGE: Path to the system partition image
Fastboot specific: $KERNEL_CMDLINE Fastboot specific: $KERNEL_CMDLINE
Heimdall specific: $PARTITION_KERNEL, $PARTITION_INITFS Heimdall specific: $PARTITION_KERNEL, $PARTITION_INITFS, $PARTITION_SYSTEM
""" """
flashers = { flashers = {
"fastboot": { "fastboot": {
@ -269,7 +270,7 @@ flashers = {
"list_devices": [["heimdall", "detect"]], "list_devices": [["heimdall", "detect"]],
"flash_system": [ "flash_system": [
["heimdall_wait_for_device.sh"], ["heimdall_wait_for_device.sh"],
["heimdall", "flash", "--SYSTEM", "$IMAGE"]], ["heimdall", "flash", "--$PARTITION_SYSTEM", "$IMAGE"]],
"flash_kernel": [["heimdall_flash_kernel.sh", "flash_kernel": [["heimdall_flash_kernel.sh",
"$BOOT/initramfs-$FLAVOR", "$PARTITION_INITFS", "$BOOT/initramfs-$FLAVOR", "$PARTITION_INITFS",
"$BOOT/vmlinuz-$FLAVOR", "$PARTITION_KERNEL"]] "$BOOT/vmlinuz-$FLAVOR", "$PARTITION_KERNEL"]]
@ -284,7 +285,7 @@ flashers = {
"list_devices": [["heimdall", "detect"]], "list_devices": [["heimdall", "detect"]],
"flash_system": [ "flash_system": [
["heimdall_wait_for_device.sh"], ["heimdall_wait_for_device.sh"],
["heimdall", "flash", "--SYSTEM", "$IMAGE"]], ["heimdall", "flash", "--$PARTITION_SYSTEM", "$IMAGE"]],
"flash_kernel": [ "flash_kernel": [
["heimdall_wait_for_device.sh"], ["heimdall_wait_for_device.sh"],
["heimdall", "flash", "--$PARTITION_KERNEL", "$BOOT/boot.img-$FLAVOR"]], ["heimdall", "flash", "--$PARTITION_KERNEL", "$BOOT/boot.img-$FLAVOR"]],

5
pmb/flasher/run.py
View file

@ -40,8 +40,9 @@ def run(args, action, flavor=None):
"$FLAVOR": flavor if flavor is not None else "", "$FLAVOR": flavor if flavor is not None else "",
"$IMAGE": "/home/user/rootfs/" + args.device + ".img", "$IMAGE": "/home/user/rootfs/" + args.device + ".img",
"$KERNEL_CMDLINE": _cmdline, "$KERNEL_CMDLINE": _cmdline,
"$PARTITION_INITFS": args.deviceinfo["flash_heimdall_partition_initfs"], "$PARTITION_KERNEL": args.deviceinfo["flash_heimdall_partition_kernel"] or "KERNEL",
"$PARTITION_KERNEL": args.deviceinfo["flash_heimdall_partition_kernel"], "$PARTITION_INITFS": args.deviceinfo["flash_heimdall_partition_initfs"] or "RECOVERY",
"$PARTITION_SYSTEM": args.deviceinfo["flash_heimdall_partition_system"] or "SYSTEM",
"$RECOVERY_ZIP": "/mnt/buildroot_" + args.deviceinfo["arch"] + "$RECOVERY_ZIP": "/mnt/buildroot_" + args.deviceinfo["arch"] +
"/var/lib/postmarketos-android-recovery-installer" "/var/lib/postmarketos-android-recovery-installer"
"/pmos-" + args.device + ".zip", "/pmos-" + args.device + ".zip",