3f133727bf
It is annoying to have disk images in the source directory since it clutters up the working space. Remove cur_dir=True from DiskHelper calls so disk images are written to the persistent-data directory instead. Move scsi.img too (used by the bootstd tests) and mmc6.img (used by the MBR tests. Add a few comments as to where the images are used. This keeps the source tree clean and puts disk images in the same place as other test data. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com>
109 lines
3.8 KiB
Python
109 lines
3.8 KiB
Python
# SPDX-License-Identifier: GPL-2.0+
|
|
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
|
|
|
|
"""Common utilities for image creation"""
|
|
|
|
import gzip
|
|
import os
|
|
|
|
import utils
|
|
from fs_helper import DiskHelper, FsHelper
|
|
|
|
|
|
def mkdir_cond(dirname):
|
|
"""Create a directory if it doesn't already exist
|
|
|
|
Args:
|
|
dirname (str): Name of directory to create
|
|
"""
|
|
if not os.path.exists(dirname):
|
|
os.mkdir(dirname)
|
|
|
|
|
|
def copy_partition(ubman, fsfile, outname):
|
|
"""Copy a partition into a disk image
|
|
|
|
Args:
|
|
ubman (ConsoleBase): U-Boot fixture
|
|
fsfile (str): Name of partition file
|
|
outname (str): Name of full-disk file to update
|
|
"""
|
|
utils.run_and_log(ubman,
|
|
f'dd if={fsfile} of={outname} bs=1M seek=1 conv=notrunc')
|
|
|
|
|
|
def setup_extlinux_image(config, log, devnum, basename, vmlinux, initrd, dtbdir,
|
|
script, part2_size=1, use_fde=0, luks_kdf='pbkdf2',
|
|
encrypt_keyfile=None, master_keyfile=None):
|
|
"""Create a 20MB disk image with a single FAT partition
|
|
|
|
Args:
|
|
config (ArbitraryAttributeContainer): Configuration
|
|
log (multiplexed_log.Logfile): Log to write to
|
|
devnum (int): Device number to use, e.g. 1
|
|
basename (str): Base name to use in the filename, e.g. 'mmc'
|
|
vmlinux (str): Kernel filename
|
|
initrd (str): Ramdisk filename
|
|
dtbdir (str or None): Devicetree filename
|
|
script (str): Script to place in the extlinux.conf file
|
|
part2_size (int): Size of second partition in MB (default: 1)
|
|
use_fde (int): LUKS version for full-disk encryption (0=none, 1=LUKS1, 2=LUKS2)
|
|
luks_kdf (str): Key derivation function for LUKS2: 'pbkdf2' or 'argon2id'.
|
|
Defaults to 'pbkdf2'. Ignored for LUKS1.
|
|
encrypt_keyfile (str, optional): Path to key file for LUKS encryption.
|
|
If provided, takes precedence over passphrase.
|
|
master_keyfile (str, optional): Path to file containing the raw master
|
|
key. If provided, this exact key is used as the LUKS master key.
|
|
"""
|
|
fsh = FsHelper(config, 'vfat', 18, prefix=basename)
|
|
fsh.setup()
|
|
|
|
ext = os.path.join(fsh.srcdir, 'extlinux')
|
|
mkdir_cond(ext)
|
|
|
|
conf = os.path.join(ext, 'extlinux.conf')
|
|
with open(conf, 'w', encoding='ascii') as fd:
|
|
print(script, file=fd)
|
|
|
|
inf = os.path.join(config.persistent_data_dir, 'inf')
|
|
with open(inf, 'wb') as fd:
|
|
fd.write(gzip.compress(b'vmlinux'))
|
|
mkimage = config.build_dir + '/tools/mkimage'
|
|
utils.run_and_log_no_ubman(
|
|
log, f'{mkimage} -f auto -d {inf} {os.path.join(fsh.srcdir, vmlinux)}')
|
|
|
|
with open(os.path.join(fsh.srcdir, initrd), 'w', encoding='ascii') as fd:
|
|
print('initrd', file=fd)
|
|
|
|
if dtbdir:
|
|
mkdir_cond(os.path.join(fsh.srcdir, dtbdir))
|
|
|
|
dtb_file = os.path.join(fsh.srcdir, f'{dtbdir}/sandbox.dtb')
|
|
utils.run_and_log_no_ubman(
|
|
log, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')
|
|
|
|
fsh.mk_fs()
|
|
|
|
img = DiskHelper(config, devnum, basename)
|
|
img.add_fs(fsh, DiskHelper.VFAT, bootable=True)
|
|
|
|
ext4 = FsHelper(config, 'ext4', max(1, part2_size - 30), prefix=basename,
|
|
part_mb=part2_size,
|
|
passphrase='test' if (use_fde and not encrypt_keyfile) else None,
|
|
encrypt_keyfile=encrypt_keyfile,
|
|
luks_version=use_fde if use_fde else 2,
|
|
luks_kdf=luks_kdf,
|
|
master_keyfile=master_keyfile)
|
|
ext4.setup()
|
|
|
|
bindir = os.path.join(ext4.srcdir, 'bin')
|
|
mkdir_cond(bindir)
|
|
with open(os.path.join(bindir, 'bash'), 'w', encoding='ascii') as fd:
|
|
print('bash', file=fd)
|
|
|
|
ext4.mk_fs()
|
|
|
|
img.add_fs(ext4, DiskHelper.EXT4)
|
|
img.create()
|
|
fsh.cleanup()
|