Merge tag 'v2025.07-rc5' into next

Prepare v2025.07-rc5

With this merge, tighten up the LTO_FLAGS removal we added to not
trigger on ARMv7 (which is Thumb-2 and should be fine).
This commit is contained in:
Tom Rini
2025-06-23 14:49:16 -06:00
20 changed files with 281 additions and 110 deletions

View File

@@ -45,8 +45,7 @@ static int print_guid(struct unit_test_state *uts)
sprintf(str, "%pUL", guid);
ut_asserteq_str("04030201-0605-0807-090A-0B0C0D0E0F10", str);
sprintf(str, "%pUs", guid_esp);
if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) ||
IS_ENABLED(CONFIG_CMD_EFIDEBUG) || IS_ENABLED(CONFIG_EFI))
if (IS_ENABLED(CONFIG_EFI_PARTITION))
ut_asserteq_str("EFI System Partition", str);
else
ut_asserteq_str("c12a7328-f81f-11d2-ba4b-00a0c93ec93b", str);

View File

@@ -330,6 +330,33 @@ def test_gpt_write(state_disk_image, ubman):
output = ubman.run_command('gpt guid host 0')
assert '375a56f7-d6c9-4e81-b5f0-09d41ca89efe' in output
@pytest.mark.boardspec('sandbox')
@pytest.mark.buildconfigspec('cmd_gpt')
@pytest.mark.buildconfigspec('cmd_part')
@pytest.mark.buildconfigspec('partition_type_guid')
@pytest.mark.requiredtool('sgdisk')
def test_gpt_write_part_type(state_disk_image, ubman):
"""Test the gpt command with part type uuid."""
output = ubman.run_command('gpt write host 0 "name=part1,type=data,size=1M;name=part2,size=512K,type=system;name=part3,size=65536,type=u-boot-env;name=part4,size=65536,type=375a56f7-d6c9-4e81-b5f0-09d41ca89efe;name=part5,size=-,type=linux"')
assert 'Writing GPT: success!' in output
output = ubman.run_command('part list host 0')
assert '1\t0x00000022\t0x00000821\t"part1"' in output
assert 'ebd0a0a2-b9e5-4433-87c0-68b6b72699c7' in output
assert '(data)' in output
assert '2\t0x00000822\t0x00000c21\t"part2"' in output
assert 'c12a7328-f81f-11d2-ba4b-00a0c93ec93b' in output
assert '(EFI System Partition)' in output
assert '3\t0x00000c22\t0x00000ca1\t"part3"' in output
assert '3de21764-95bd-54bd-a5c3-4abe786f38a8' in output
assert '(u-boot-env)' in output
assert '4\t0x00000ca2\t0x00000d21\t"part4"' in output
assert 'ebd0a0a2-b9e5-4433-87c0-68b6b72699c7' in output
assert '(375a56f7-d6c9-4e81-b5f0-09d41ca89efe)' in output
assert '5\t0x00000d22\t0x00001fde\t"part5"' in output
assert '0fc63daf-8483-4772-8e79-3d69d8477de4' in output
assert '(linux)' in output
@pytest.mark.buildconfigspec('cmd_gpt')
@pytest.mark.buildconfigspec('cmd_gpt_rename')
@pytest.mark.buildconfigspec('cmd_part')