mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-17 10:24:49 +00:00
Merge patch series "test: Avoid needing sudo for image-creation"
Simon Glass <sjg@chromium.org> says: This series rebases and tidies up a series sent by Richard Weinberger to use unprivileged code to build the test images. Link: https://patchwork.ozlabs.org/project/uboot/list/?series=417786&state=* Link: https://lore.kernel.org/r/20241121223217.330117-1-sjg@chromium.org Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
commit
230284b3e8
5 changed files with 157 additions and 324 deletions
Binary file not shown.
Binary file not shown.
|
|
@ -9,7 +9,7 @@ import re
|
|||
import os
|
||||
from subprocess import call, check_call, check_output, CalledProcessError
|
||||
|
||||
def mk_fs(config, fs_type, size, prefix, size_gran = 0x100000):
|
||||
def mk_fs(config, fs_type, size, prefix, src_dir=None, size_gran = 0x100000):
|
||||
"""Create a file system volume
|
||||
|
||||
Args:
|
||||
|
|
@ -17,6 +17,7 @@ def mk_fs(config, fs_type, size, prefix, size_gran = 0x100000):
|
|||
fs_type (str): File system type, e.g. 'ext4'
|
||||
size (int): Size of file system in bytes
|
||||
prefix (str): Prefix string of volume's file name
|
||||
src_dir (str): Root directory to use, or None for none
|
||||
size_gran (int): Size granularity of file system image in bytes
|
||||
|
||||
Raises:
|
||||
|
|
@ -39,6 +40,12 @@ def mk_fs(config, fs_type, size, prefix, size_gran = 0x100000):
|
|||
else:
|
||||
fs_lnxtype = fs_type
|
||||
|
||||
if src_dir:
|
||||
if fs_lnxtype == 'ext4':
|
||||
mkfs_opt = mkfs_opt + ' -d ' + src_dir
|
||||
elif fs_lnxtype != 'vfat':
|
||||
raise ValueError(f'src_dir not implemented for fs {fs_lnxtype}')
|
||||
|
||||
count = (size + size_gran - 1) // size_gran
|
||||
|
||||
# Some distributions do not add /sbin to the default PATH, where mkfs lives
|
||||
|
|
@ -55,6 +62,8 @@ def mk_fs(config, fs_type, size, prefix, size_gran = 0x100000):
|
|||
shell=True).decode()
|
||||
if 'metadata_csum' in sb_content:
|
||||
check_call(f'tune2fs -O ^metadata_csum {fs_img}', shell=True)
|
||||
elif fs_lnxtype == 'vfat' and src_dir:
|
||||
check_call(f'mcopy -i {fs_img} -vsmpQ {src_dir}/* ::/', shell=True)
|
||||
return fs_img
|
||||
except CalledProcessError:
|
||||
call(f'rm -f {fs_img}', shell=True)
|
||||
|
|
|
|||
|
|
@ -156,64 +156,6 @@ def tool_is_in_path(tool):
|
|||
return True
|
||||
return False
|
||||
|
||||
fuse_mounted = False
|
||||
|
||||
def mount_fs(fs_type, device, mount_point):
|
||||
"""Mount a volume.
|
||||
|
||||
Args:
|
||||
fs_type: File system type.
|
||||
device: Volume's file name.
|
||||
mount_point: Mount point.
|
||||
|
||||
Return:
|
||||
Nothing.
|
||||
"""
|
||||
global fuse_mounted
|
||||
|
||||
try:
|
||||
check_call('guestmount --pid-file guestmount.pid -a %s -m /dev/sda %s'
|
||||
% (device, mount_point), shell=True)
|
||||
fuse_mounted = True
|
||||
return
|
||||
except CalledProcessError:
|
||||
fuse_mounted = False
|
||||
|
||||
mount_opt = 'loop,rw'
|
||||
if re.match('fat', fs_type):
|
||||
mount_opt += ',umask=0000'
|
||||
|
||||
check_call('sudo mount -o %s %s %s'
|
||||
% (mount_opt, device, mount_point), shell=True)
|
||||
|
||||
# may not be effective for some file systems
|
||||
check_call('sudo chmod a+rw %s' % mount_point, shell=True)
|
||||
|
||||
def umount_fs(mount_point):
|
||||
"""Unmount a volume.
|
||||
|
||||
Args:
|
||||
mount_point: Mount point.
|
||||
|
||||
Return:
|
||||
Nothing.
|
||||
"""
|
||||
if fuse_mounted:
|
||||
call('sync')
|
||||
call('guestunmount %s' % mount_point, shell=True)
|
||||
|
||||
try:
|
||||
with open("guestmount.pid", "r") as pidfile:
|
||||
pid = int(pidfile.read())
|
||||
util.waitpid(pid, kill=True)
|
||||
os.remove("guestmount.pid")
|
||||
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
else:
|
||||
call('sudo umount %s' % mount_point, shell=True)
|
||||
|
||||
#
|
||||
# Fixture for basic fs test
|
||||
# derived from test/fs/fs-test.sh
|
||||
|
|
@ -236,38 +178,21 @@ def fs_obj_basic(request, u_boot_config):
|
|||
fs_ubtype = fstype_to_ubname(fs_type)
|
||||
check_ubconfig(u_boot_config, fs_ubtype)
|
||||
|
||||
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
||||
scratch_dir = u_boot_config.persistent_data_dir + '/scratch'
|
||||
|
||||
small_file = mount_dir + '/' + SMALL_FILE
|
||||
big_file = mount_dir + '/' + BIG_FILE
|
||||
small_file = scratch_dir + '/' + SMALL_FILE
|
||||
big_file = scratch_dir + '/' + BIG_FILE
|
||||
|
||||
try:
|
||||
|
||||
# 3GiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0xc0000000, '3GB')
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
try:
|
||||
check_call('mkdir -p %s' % mount_dir, shell=True)
|
||||
check_call('mkdir -p %s' % scratch_dir, shell=True)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Mount the image so we can populate it.
|
||||
mount_fs(fs_type, fs_img, mount_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Create a subdirectory.
|
||||
check_call('mkdir %s/SUBDIR' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/SUBDIR' % scratch_dir, shell=True)
|
||||
|
||||
# Create big file in this image.
|
||||
# Note that we work only on the start 1MB, couple MBs in the 2GB range
|
||||
|
|
@ -326,15 +251,20 @@ def fs_obj_basic(request, u_boot_config):
|
|||
% big_file, shell=True).decode()
|
||||
md5val.append(out.split()[0])
|
||||
|
||||
try:
|
||||
# 3GiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0xc0000000, '3GB', scratch_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
umount_fs(mount_dir)
|
||||
return
|
||||
else:
|
||||
umount_fs(mount_dir)
|
||||
yield [fs_ubtype, fs_img, md5val]
|
||||
finally:
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -rf %s' % scratch_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
|
||||
#
|
||||
|
|
@ -358,38 +288,21 @@ def fs_obj_ext(request, u_boot_config):
|
|||
fs_ubtype = fstype_to_ubname(fs_type)
|
||||
check_ubconfig(u_boot_config, fs_ubtype)
|
||||
|
||||
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
||||
scratch_dir = u_boot_config.persistent_data_dir + '/scratch'
|
||||
|
||||
min_file = mount_dir + '/' + MIN_FILE
|
||||
tmp_file = mount_dir + '/tmpfile'
|
||||
min_file = scratch_dir + '/' + MIN_FILE
|
||||
tmp_file = scratch_dir + '/tmpfile'
|
||||
|
||||
try:
|
||||
|
||||
# 128MiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
try:
|
||||
check_call('mkdir -p %s' % mount_dir, shell=True)
|
||||
check_call('mkdir -p %s' % scratch_dir, shell=True)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Mount the image so we can populate it.
|
||||
mount_fs(fs_type, fs_img, mount_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Create a test directory
|
||||
check_call('mkdir %s/dir1' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/dir1' % scratch_dir, shell=True)
|
||||
|
||||
# Create a small file and calculate md5
|
||||
check_call('dd if=/dev/urandom of=%s bs=1K count=20'
|
||||
|
|
@ -427,15 +340,21 @@ def fs_obj_ext(request, u_boot_config):
|
|||
md5val.append(out.split()[0])
|
||||
|
||||
check_call('rm %s' % tmp_file, shell=True)
|
||||
|
||||
try:
|
||||
# 128MiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB', scratch_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
except CalledProcessError:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
||||
umount_fs(mount_dir)
|
||||
return
|
||||
else:
|
||||
umount_fs(mount_dir)
|
||||
yield [fs_ubtype, fs_img, md5val]
|
||||
finally:
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -rf %s' % scratch_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
|
||||
#
|
||||
|
|
@ -461,7 +380,7 @@ def fs_obj_mkdir(request, u_boot_config):
|
|||
|
||||
try:
|
||||
# 128MiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB', None)
|
||||
except:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
||||
return
|
||||
|
|
@ -490,63 +409,51 @@ def fs_obj_unlink(request, u_boot_config):
|
|||
fs_ubtype = fstype_to_ubname(fs_type)
|
||||
check_ubconfig(u_boot_config, fs_ubtype)
|
||||
|
||||
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
||||
scratch_dir = u_boot_config.persistent_data_dir + '/scratch'
|
||||
|
||||
try:
|
||||
|
||||
# 128MiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB')
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
try:
|
||||
check_call('mkdir -p %s' % mount_dir, shell=True)
|
||||
check_call('mkdir -p %s' % scratch_dir, shell=True)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Mount the image so we can populate it.
|
||||
mount_fs(fs_type, fs_img, mount_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Test Case 1 & 3
|
||||
check_call('mkdir %s/dir1' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/dir1' % scratch_dir, shell=True)
|
||||
check_call('dd if=/dev/urandom of=%s/dir1/file1 bs=1K count=1'
|
||||
% mount_dir, shell=True)
|
||||
% scratch_dir, shell=True)
|
||||
check_call('dd if=/dev/urandom of=%s/dir1/file2 bs=1K count=1'
|
||||
% mount_dir, shell=True)
|
||||
% scratch_dir, shell=True)
|
||||
|
||||
# Test Case 2
|
||||
check_call('mkdir %s/dir2' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/dir2' % scratch_dir, shell=True)
|
||||
for i in range(0, 20):
|
||||
check_call('mkdir %s/dir2/0123456789abcdef%02x'
|
||||
% (mount_dir, i), shell=True)
|
||||
% (scratch_dir, i), shell=True)
|
||||
|
||||
# Test Case 4
|
||||
check_call('mkdir %s/dir4' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/dir4' % scratch_dir, shell=True)
|
||||
|
||||
# Test Case 5, 6 & 7
|
||||
check_call('mkdir %s/dir5' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/dir5' % scratch_dir, shell=True)
|
||||
check_call('dd if=/dev/urandom of=%s/dir5/file1 bs=1K count=1'
|
||||
% mount_dir, shell=True)
|
||||
% scratch_dir, shell=True)
|
||||
|
||||
try:
|
||||
# 128MiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x8000000, '128MB', scratch_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
except CalledProcessError:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
||||
umount_fs(mount_dir)
|
||||
return
|
||||
else:
|
||||
umount_fs(mount_dir)
|
||||
yield [fs_ubtype, fs_img]
|
||||
finally:
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -rf %s' % scratch_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
|
||||
#
|
||||
|
|
@ -570,38 +477,21 @@ def fs_obj_symlink(request, u_boot_config):
|
|||
fs_ubtype = fstype_to_ubname(fs_type)
|
||||
check_ubconfig(u_boot_config, fs_ubtype)
|
||||
|
||||
mount_dir = u_boot_config.persistent_data_dir + '/mnt'
|
||||
scratch_dir = u_boot_config.persistent_data_dir + '/scratch'
|
||||
|
||||
small_file = mount_dir + '/' + SMALL_FILE
|
||||
medium_file = mount_dir + '/' + MEDIUM_FILE
|
||||
small_file = scratch_dir + '/' + SMALL_FILE
|
||||
medium_file = scratch_dir + '/' + MEDIUM_FILE
|
||||
|
||||
try:
|
||||
|
||||
# 1GiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x40000000, '1GB')
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
try:
|
||||
check_call('mkdir -p %s' % mount_dir, shell=True)
|
||||
check_call('mkdir -p %s' % scratch_dir, shell=True)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Mount the image so we can populate it.
|
||||
mount_fs(fs_type, fs_img, mount_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
return
|
||||
|
||||
try:
|
||||
# Create a subdirectory.
|
||||
check_call('mkdir %s/SUBDIR' % mount_dir, shell=True)
|
||||
check_call('mkdir %s/SUBDIR' % scratch_dir, shell=True)
|
||||
|
||||
# Create a small file in this image.
|
||||
check_call('dd if=/dev/urandom of=%s bs=1M count=1'
|
||||
|
|
@ -621,15 +511,20 @@ def fs_obj_symlink(request, u_boot_config):
|
|||
% medium_file, shell=True).decode()
|
||||
md5val.extend([out.split()[0]])
|
||||
|
||||
try:
|
||||
# 1GiB volume
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, 0x40000000, '1GB', scratch_dir)
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Creating failed for filesystem: ' + fs_type + '. {}'.format(err))
|
||||
return
|
||||
|
||||
except CalledProcessError:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
||||
umount_fs(mount_dir)
|
||||
return
|
||||
else:
|
||||
umount_fs(mount_dir)
|
||||
yield [fs_ubtype, fs_img, md5val]
|
||||
finally:
|
||||
call('rmdir %s' % mount_dir, shell=True)
|
||||
call('rm -rf %s' % scratch_dir, shell=True)
|
||||
call('rm -f %s' % fs_img, shell=True)
|
||||
|
||||
#
|
||||
|
|
@ -665,7 +560,7 @@ def fs_obj_fat(request, u_boot_config):
|
|||
|
||||
try:
|
||||
# the volume size depends on the filesystem
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, fs_size, f'{fs_size}', 1024)
|
||||
fs_img = fs_helper.mk_fs(u_boot_config, fs_type, fs_size, f'{fs_size}', None, 1024)
|
||||
except:
|
||||
pytest.skip('Setup failed for filesystem: ' + fs_type)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ test one at a time, as well setting up some files needed by the tests.
|
|||
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
|
||||
"""
|
||||
import collections
|
||||
import getpass
|
||||
import gzip
|
||||
import os
|
||||
import os.path
|
||||
|
|
@ -28,70 +27,36 @@ def mkdir_cond(dirname):
|
|||
if not os.path.exists(dirname):
|
||||
os.mkdir(dirname)
|
||||
|
||||
def setup_image(cons, devnum, part_type, second_part=False, basename='mmc'):
|
||||
"""Create a 20MB disk image with a single partition
|
||||
def setup_image(cons, devnum, part_type, img_size=20, second_part=False,
|
||||
basename='mmc'):
|
||||
"""Create a disk image with a single partition
|
||||
|
||||
Args:
|
||||
cons (ConsoleBase): Console to use
|
||||
devnum (int): Device number to use, e.g. 1
|
||||
part_type (int): Partition type, e.g. 0xc for FAT32
|
||||
img_size (int): Image size in MiB
|
||||
second_part (bool): True to contain a small second partition
|
||||
basename (str): Base name to use in the filename, e.g. 'mmc'
|
||||
|
||||
Returns:
|
||||
tuple:
|
||||
str: Filename of MMC image
|
||||
str: Directory name of 'mnt' directory
|
||||
str: Directory name of scratch directory
|
||||
"""
|
||||
fname = os.path.join(cons.config.source_dir, f'{basename}{devnum}.img')
|
||||
mnt = os.path.join(cons.config.persistent_data_dir, 'mnt')
|
||||
mnt = os.path.join(cons.config.persistent_data_dir, 'scratch')
|
||||
mkdir_cond(mnt)
|
||||
|
||||
spec = f'type={part_type:x}, size=18M, bootable'
|
||||
spec = f'type={part_type:x}, size={img_size - 2}M, start=1M, bootable'
|
||||
if second_part:
|
||||
spec += '\ntype=c'
|
||||
|
||||
u_boot_utils.run_and_log(cons, f'qemu-img create {fname} 20M')
|
||||
u_boot_utils.run_and_log(cons, f'sudo sfdisk {fname}',
|
||||
u_boot_utils.run_and_log(cons, f'sfdisk {fname}',
|
||||
stdin=spec.encode('utf-8'))
|
||||
return fname, mnt
|
||||
|
||||
def mount_image(cons, fname, mnt, fstype):
|
||||
"""Create a filesystem and mount it on partition 1
|
||||
|
||||
Args:
|
||||
cons (ConsoleBase): Console to use
|
||||
fname (str): Filename of MMC image
|
||||
mnt (str): Directory name of 'mnt' directory
|
||||
fstype (str): Filesystem type ('vfat' or 'ext4')
|
||||
|
||||
Returns:
|
||||
str: Name of loop device used
|
||||
"""
|
||||
out = u_boot_utils.run_and_log(cons, f'sudo losetup --show -f -P {fname}')
|
||||
loop = out.strip()
|
||||
part = f'{loop}p1'
|
||||
u_boot_utils.run_and_log(cons, f'sudo mkfs.{fstype} {part}')
|
||||
opts = ''
|
||||
if fstype == 'vfat':
|
||||
opts += f' -o uid={os.getuid()},gid={os.getgid()}'
|
||||
u_boot_utils.run_and_log(cons, f'sudo mount -o loop {part} {mnt}{opts}')
|
||||
u_boot_utils.run_and_log(cons, f'sudo chown {getpass.getuser()} {mnt}')
|
||||
return loop
|
||||
|
||||
def copy_prepared_image(cons, devnum, fname, basename='mmc'):
|
||||
"""Use a prepared image since we cannot create one
|
||||
|
||||
Args:
|
||||
cons (ConsoleBase): Console touse
|
||||
devnum (int): device number
|
||||
fname (str): Filename of MMC image
|
||||
basename (str): Base name to use in the filename, e.g. 'mmc'
|
||||
"""
|
||||
infname = os.path.join(cons.config.source_dir,
|
||||
f'test/py/tests/bootstd/{basename}{devnum}.img.xz')
|
||||
u_boot_utils.run_and_log(cons, ['sh', '-c', f'xz -dc {infname} >{fname}'])
|
||||
|
||||
def setup_bootmenu_image(cons):
|
||||
"""Create a 20MB disk image with a single ext4 partition
|
||||
|
||||
|
|
@ -100,14 +65,7 @@ def setup_bootmenu_image(cons):
|
|||
mmc_dev = 4
|
||||
fname, mnt = setup_image(cons, mmc_dev, 0x83)
|
||||
|
||||
loop = None
|
||||
mounted = False
|
||||
complete = False
|
||||
try:
|
||||
loop = mount_image(cons, fname, mnt, 'ext4')
|
||||
mounted = True
|
||||
|
||||
script = '''# DO NOT EDIT THIS FILE
|
||||
script = '''# DO NOT EDIT THIS FILE
|
||||
#
|
||||
# Please edit /boot/armbianEnv.txt to set supported parameters
|
||||
#
|
||||
|
|
@ -181,64 +139,52 @@ booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
|
|||
# Recompile with:
|
||||
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
|
||||
'''
|
||||
bootdir = os.path.join(mnt, 'boot')
|
||||
mkdir_cond(bootdir)
|
||||
cmd_fname = os.path.join(bootdir, 'boot.cmd')
|
||||
scr_fname = os.path.join(bootdir, 'boot.scr')
|
||||
with open(cmd_fname, 'w', encoding='ascii') as outf:
|
||||
print(script, file=outf)
|
||||
bootdir = os.path.join(mnt, 'boot')
|
||||
mkdir_cond(bootdir)
|
||||
cmd_fname = os.path.join(bootdir, 'boot.cmd')
|
||||
scr_fname = os.path.join(bootdir, 'boot.scr')
|
||||
with open(cmd_fname, 'w', encoding='ascii') as outf:
|
||||
print(script, file=outf)
|
||||
|
||||
infname = os.path.join(cons.config.source_dir,
|
||||
'test/py/tests/bootstd/armbian.bmp.xz')
|
||||
bmp_file = os.path.join(bootdir, 'boot.bmp')
|
||||
u_boot_utils.run_and_log(
|
||||
cons,
|
||||
['sh', '-c', f'xz -dc {infname} >{bmp_file}'])
|
||||
infname = os.path.join(cons.config.source_dir,
|
||||
'test/py/tests/bootstd/armbian.bmp.xz')
|
||||
bmp_file = os.path.join(bootdir, 'boot.bmp')
|
||||
u_boot_utils.run_and_log(
|
||||
cons,
|
||||
['sh', '-c', f'xz -dc {infname} >{bmp_file}'])
|
||||
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'mkimage -C none -A arm -T script -d {cmd_fname} {scr_fname}')
|
||||
mkimage = cons.config.build_dir + '/tools/mkimage'
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'{mkimage} -C none -A arm -T script -d {cmd_fname} {scr_fname}')
|
||||
|
||||
kernel = 'vmlinuz-5.15.63-rockchip64'
|
||||
target = os.path.join(bootdir, kernel)
|
||||
with open(target, 'wb') as outf:
|
||||
print('kernel', outf)
|
||||
kernel = 'vmlinuz-5.15.63-rockchip64'
|
||||
target = os.path.join(bootdir, kernel)
|
||||
with open(target, 'wb') as outf:
|
||||
print('kernel', outf)
|
||||
|
||||
symlink = os.path.join(bootdir, 'Image')
|
||||
if os.path.exists(symlink):
|
||||
os.remove(symlink)
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'echo here {kernel} {symlink}')
|
||||
os.symlink(kernel, symlink)
|
||||
symlink = os.path.join(bootdir, 'Image')
|
||||
if os.path.exists(symlink):
|
||||
os.remove(symlink)
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'echo here {kernel} {symlink}')
|
||||
os.symlink(kernel, symlink)
|
||||
|
||||
complete = True
|
||||
|
||||
except ValueError as exc:
|
||||
print(f'Falled to create image, failing back to prepared copy: {exc}')
|
||||
finally:
|
||||
if mounted:
|
||||
u_boot_utils.run_and_log(cons, f'sudo umount --lazy {mnt}')
|
||||
if loop:
|
||||
u_boot_utils.run_and_log(cons, f'sudo losetup -d {loop}')
|
||||
|
||||
if not complete:
|
||||
copy_prepared_image(cons, mmc_dev, fname)
|
||||
fsfile = 'ext18M.img'
|
||||
u_boot_utils.run_and_log(cons, f'fallocate -l 18M {fsfile}')
|
||||
u_boot_utils.run_and_log(cons, f'mkfs.ext4 {fsfile} -d {mnt}')
|
||||
u_boot_utils.run_and_log(cons, f'dd if={fsfile} of={fname} bs=1M seek=1')
|
||||
u_boot_utils.run_and_log(cons, f'rm -rf {mnt}')
|
||||
u_boot_utils.run_and_log(cons, f'rm -f {fsfile}')
|
||||
|
||||
def setup_bootflow_image(cons):
|
||||
"""Create a 20MB disk image with a single FAT partition"""
|
||||
mmc_dev = 1
|
||||
fname, mnt = setup_image(cons, mmc_dev, 0xc, second_part=True)
|
||||
|
||||
loop = None
|
||||
mounted = False
|
||||
complete = False
|
||||
try:
|
||||
loop = mount_image(cons, fname, mnt, 'vfat')
|
||||
mounted = True
|
||||
|
||||
vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl'
|
||||
initrd = 'initramfs-5.3.7-301.fc31.armv7hl.img'
|
||||
dtbdir = 'dtb-5.3.7-301.fc31.armv7hl'
|
||||
script = '''# extlinux.conf generated by appliance-creator
|
||||
vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl'
|
||||
initrd = 'initramfs-5.3.7-301.fc31.armv7hl.img'
|
||||
dtbdir = 'dtb-5.3.7-301.fc31.armv7hl'
|
||||
script = '''# extlinux.conf generated by appliance-creator
|
||||
ui menu.c32
|
||||
menu autoboot Welcome to Fedora-Workstation-armhfp-31-1.9. Automatic boot in # second{,s}. Press a key for options.
|
||||
menu title Fedora-Workstation-armhfp-31-1.9 Boot Options.
|
||||
|
|
@ -251,39 +197,36 @@ label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)
|
|||
append ro root=UUID=9732b35b-4cd5-458b-9b91-80f7047e0b8a rhgb quiet LANG=en_US.UTF-8 cma=192MB cma=256MB
|
||||
fdtdir /%s/
|
||||
initrd /%s''' % (vmlinux, dtbdir, initrd)
|
||||
ext = os.path.join(mnt, 'extlinux')
|
||||
mkdir_cond(ext)
|
||||
ext = os.path.join(mnt, 'extlinux')
|
||||
mkdir_cond(ext)
|
||||
|
||||
conf = os.path.join(ext, 'extlinux.conf')
|
||||
with open(conf, 'w', encoding='ascii') as fd:
|
||||
print(script, file=fd)
|
||||
conf = os.path.join(ext, 'extlinux.conf')
|
||||
with open(conf, 'w', encoding='ascii') as fd:
|
||||
print(script, file=fd)
|
||||
|
||||
inf = os.path.join(cons.config.persistent_data_dir, 'inf')
|
||||
with open(inf, 'wb') as fd:
|
||||
fd.write(gzip.compress(b'vmlinux'))
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'mkimage -f auto -d {inf} {os.path.join(mnt, vmlinux)}')
|
||||
inf = os.path.join(cons.config.persistent_data_dir, 'inf')
|
||||
with open(inf, 'wb') as fd:
|
||||
fd.write(gzip.compress(b'vmlinux'))
|
||||
mkimage = cons.config.build_dir + '/tools/mkimage'
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'{mkimage} -f auto -d {inf} {os.path.join(mnt, vmlinux)}')
|
||||
|
||||
with open(os.path.join(mnt, initrd), 'w', encoding='ascii') as fd:
|
||||
print('initrd', file=fd)
|
||||
with open(os.path.join(mnt, initrd), 'w', encoding='ascii') as fd:
|
||||
print('initrd', file=fd)
|
||||
|
||||
mkdir_cond(os.path.join(mnt, dtbdir))
|
||||
mkdir_cond(os.path.join(mnt, dtbdir))
|
||||
|
||||
dtb_file = os.path.join(mnt, f'{dtbdir}/sandbox.dtb')
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')
|
||||
complete = True
|
||||
except ValueError as exc:
|
||||
print(f'Falled to create image, failing back to prepared copy: {exc}')
|
||||
finally:
|
||||
if mounted:
|
||||
u_boot_utils.run_and_log(cons, f'sudo umount --lazy {mnt}')
|
||||
if loop:
|
||||
u_boot_utils.run_and_log(cons, f'sudo losetup -d {loop}')
|
||||
|
||||
if not complete:
|
||||
copy_prepared_image(cons, mmc_dev, fname)
|
||||
dtb_file = os.path.join(mnt, f'{dtbdir}/sandbox.dtb')
|
||||
u_boot_utils.run_and_log(
|
||||
cons, f'dtc -o {dtb_file}', stdin=b'/dts-v1/; / {};')
|
||||
|
||||
fsfile = 'vfat18M.img'
|
||||
u_boot_utils.run_and_log(cons, f'fallocate -l 18M {fsfile}')
|
||||
u_boot_utils.run_and_log(cons, f'mkfs.vfat {fsfile}')
|
||||
u_boot_utils.run_and_log(cons, ['sh', '-c', f'mcopy -i {fsfile} {mnt}/* ::/'])
|
||||
u_boot_utils.run_and_log(cons, f'dd if={fsfile} of={fname} bs=1M seek=1')
|
||||
u_boot_utils.run_and_log(cons, f'rm -rf {mnt}')
|
||||
u_boot_utils.run_and_log(cons, f'rm -f {fsfile}')
|
||||
|
||||
def setup_cros_image(cons):
|
||||
"""Create a 20MB disk image with ChromiumOS partitions"""
|
||||
|
|
@ -334,8 +277,6 @@ def setup_cros_image(cons):
|
|||
mmc_dev = 5
|
||||
fname = os.path.join(cons.config.source_dir, f'mmc{mmc_dev}.img')
|
||||
u_boot_utils.run_and_log(cons, f'qemu-img create {fname} 20M')
|
||||
#mnt = os.path.join(cons.config.persistent_data_dir, 'mnt')
|
||||
#mkdir_cond(mnt)
|
||||
u_boot_utils.run_and_log(cons, f'cgpt create {fname}')
|
||||
|
||||
uuid_state = 'ebd0a0a2-b9e5-4433-87c0-68b6b72699c7'
|
||||
|
|
@ -589,8 +530,8 @@ def test_ut_dm_init(u_boot_console):
|
|||
u_boot_utils.run_and_log(
|
||||
u_boot_console, f'sfdisk {fn}', stdin=b'type=83')
|
||||
|
||||
fs_helper.mk_fs(u_boot_console.config, 'ext2', 0x200000, '2MB')
|
||||
fs_helper.mk_fs(u_boot_console.config, 'fat32', 0x100000, '1MB')
|
||||
fs_helper.mk_fs(u_boot_console.config, 'ext2', 0x200000, '2MB', None)
|
||||
fs_helper.mk_fs(u_boot_console.config, 'fat32', 0x100000, '1MB', None)
|
||||
|
||||
mmc_dev = 6
|
||||
fn = os.path.join(u_boot_console.config.source_dir, f'mmc{mmc_dev}.img')
|
||||
|
|
@ -606,35 +547,23 @@ def setup_efi_image(cons):
|
|||
fname, mnt = setup_image(cons, devnum, 0xc, second_part=True,
|
||||
basename=basename)
|
||||
|
||||
loop = None
|
||||
mounted = False
|
||||
complete = False
|
||||
try:
|
||||
loop = mount_image(cons, fname, mnt, 'ext4')
|
||||
mounted = True
|
||||
efi_dir = os.path.join(mnt, 'EFI')
|
||||
mkdir_cond(efi_dir)
|
||||
bootdir = os.path.join(efi_dir, 'BOOT')
|
||||
mkdir_cond(bootdir)
|
||||
efi_src = os.path.join(cons.config.build_dir,
|
||||
f'lib/efi_loader/testapp.efi')
|
||||
efi_dst = os.path.join(bootdir, 'BOOTSBOX.EFI')
|
||||
with open(efi_src, 'rb') as inf:
|
||||
with open(efi_dst, 'wb') as outf:
|
||||
outf.write(inf.read())
|
||||
complete = True
|
||||
except ValueError as exc:
|
||||
print(f'Falled to create image, failing back to prepared copy: {exc}')
|
||||
|
||||
finally:
|
||||
if mounted:
|
||||
u_boot_utils.run_and_log(cons, 'sudo umount --lazy %s' % mnt)
|
||||
if loop:
|
||||
u_boot_utils.run_and_log(cons, 'sudo losetup -d %s' % loop)
|
||||
|
||||
if not complete:
|
||||
copy_prepared_image(cons, devnum, fname, basename)
|
||||
|
||||
efi_dir = os.path.join(mnt, 'EFI')
|
||||
mkdir_cond(efi_dir)
|
||||
bootdir = os.path.join(efi_dir, 'BOOT')
|
||||
mkdir_cond(bootdir)
|
||||
efi_src = os.path.join(cons.config.build_dir,
|
||||
'lib/efi_loader/testapp.efi')
|
||||
efi_dst = os.path.join(bootdir, 'BOOTSBOX.EFI')
|
||||
with open(efi_src, 'rb') as inf:
|
||||
with open(efi_dst, 'wb') as outf:
|
||||
outf.write(inf.read())
|
||||
fsfile = 'vfat18M.img'
|
||||
u_boot_utils.run_and_log(cons, f'fallocate -l 18M {fsfile}')
|
||||
u_boot_utils.run_and_log(cons, f'mkfs.vfat {fsfile}')
|
||||
u_boot_utils.run_and_log(cons, ['sh', '-c', f'mcopy -vs -i {fsfile} {mnt}/* ::/'])
|
||||
u_boot_utils.run_and_log(cons, f'dd if={fsfile} of={fname} bs=1M seek=1')
|
||||
u_boot_utils.run_and_log(cons, f'rm -rf {mnt}')
|
||||
u_boot_utils.run_and_log(cons, f'rm -f {fsfile}')
|
||||
|
||||
@pytest.mark.buildconfigspec('cmd_bootflow')
|
||||
@pytest.mark.buildconfigspec('sandbox')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue