pmb/export: Fix Odin export filenames (MR 2191)
Since pmaports@50ee94d8 the kernel filename won't contain the flavor information, but this is not correctly synchronized with the Odin export. This fixes Odin export.
This commit is contained in:
parent
c0cec06df8
commit
87f7520e51
|
@ -19,6 +19,12 @@ def odin(args, flavor, folder):
|
||||||
pmb.flasher.init(args)
|
pmb.flasher.init(args)
|
||||||
suffix = "rootfs_" + args.device
|
suffix = "rootfs_" + args.device
|
||||||
|
|
||||||
|
# Backwards compatibility with old mkinitfs (pma#660)
|
||||||
|
suffix_flavor = f"-{flavor}"
|
||||||
|
pmaports_cfg = pmb.config.pmaports.read_config(args)
|
||||||
|
if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
|
||||||
|
suffix_flavor = ""
|
||||||
|
|
||||||
# Validate method
|
# Validate method
|
||||||
method = args.deviceinfo["flash_method"]
|
method = args.deviceinfo["flash_method"]
|
||||||
if not method.startswith("heimdall-"):
|
if not method.startswith("heimdall-"):
|
||||||
|
@ -54,16 +60,16 @@ def odin(args, flavor, folder):
|
||||||
if method == "heimdall-isorec":
|
if method == "heimdall-isorec":
|
||||||
handle.write(
|
handle.write(
|
||||||
# Kernel: copy and append md5
|
# Kernel: copy and append md5
|
||||||
f"cp /boot/vmlinuz-{flavor} {odin_kernel_md5}\n"
|
f"cp /boot/vmlinuz{suffix_flavor} {odin_kernel_md5}\n"
|
||||||
f"md5sum -t {odin_kernel_md5} >> {odin_kernel_md5}\n"
|
f"md5sum -t {odin_kernel_md5} >> {odin_kernel_md5}\n"
|
||||||
# Initramfs: recompress with lzop, append md5
|
# Initramfs: recompress with lzop, append md5
|
||||||
f"gunzip -c /boot/initramfs-{flavor}"
|
f"gunzip -c /boot/initramfs{suffix_flavor}"
|
||||||
f" | lzop > {odin_initfs_md5}\n"
|
f" | lzop > {odin_initfs_md5}\n"
|
||||||
f"md5sum -t {odin_initfs_md5} >> {odin_initfs_md5}\n")
|
f"md5sum -t {odin_initfs_md5} >> {odin_initfs_md5}\n")
|
||||||
elif method == "heimdall-bootimg":
|
elif method == "heimdall-bootimg":
|
||||||
handle.write(
|
handle.write(
|
||||||
# boot.img: copy and append md5
|
# boot.img: copy and append md5
|
||||||
f"cp /boot/boot.img-{flavor} {odin_kernel_md5}\n"
|
f"cp /boot/boot.img{suffix_flavor} {odin_kernel_md5}\n"
|
||||||
f"md5sum -t {odin_kernel_md5} >> {odin_kernel_md5}\n")
|
f"md5sum -t {odin_kernel_md5} >> {odin_kernel_md5}\n")
|
||||||
handle.write(
|
handle.write(
|
||||||
# Create tar, remove included files and append md5
|
# Create tar, remove included files and append md5
|
||||||
|
|
Loading…
Reference in New Issue