Skip to content

Commit f7ae961

Browse files
committed
test/functional: Update buildroot images to 2024.11
The main changes compared to upstream 2024.11 buildroot are - bumped Linux to version 6.11.11 with a custom config - changed U-Boot to OpenBMC branch for more support - included extra target packages See branch [1] for more details. There is a slight output change when powering off the machine, the console now contains : reboot: Power off not available: System halted Adjust accordingly the expect string in do_test_arm_aspeed_buildroot_poweroff(). [1] https://github.com/legoater/buildroot/commits/aspeed-2024.11 Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com> Link: https://lore.kernel.org/qemu-devel/20250122070909.1138598-9-clg@redhat.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
1 parent a03e138 commit f7ae961

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

tests/functional/aspeed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'
4242

4343
def do_test_arm_aspeed_buildroot_poweroff(self):
4444
exec_command_and_wait_for_pattern(self, 'poweroff',
45-
'reboot: System halted');
45+
'System halted');
4646

4747
def do_test_arm_aspeed_sdk_start(self, image):
4848
self.require_netdev('user')

tests/functional/test_arm_aspeed_ast2500.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
class AST2500Machine(AspeedTest):
1313

14-
ASSET_BR2_202311_AST2500_FLASH = Asset(
14+
ASSET_BR2_202411_AST2500_FLASH = Asset(
1515
('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
16-
'images/ast2500-evb/buildroot-2023.11/flash.img'),
17-
'c23db6160cf77d0258397eb2051162c8473a56c441417c52a91ba217186e715f')
16+
'images/ast2500-evb/buildroot-2024.11/flash.img'),
17+
'641e6906c18c0f19a2aeb48099d66d4771929c361001d554d0d45c667413e13a')
1818

1919
def test_arm_ast2500_evb_buildroot(self):
2020
self.set_machine('ast2500-evb')
2121

22-
image_path = self.ASSET_BR2_202311_AST2500_FLASH.fetch()
22+
image_path = self.ASSET_BR2_202411_AST2500_FLASH.fetch()
2323

2424
self.vm.add_args('-device',
2525
'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');

tests/functional/test_arm_aspeed_ast2600.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
class AST2600Machine(AspeedTest):
1818

19-
ASSET_BR2_202311_AST2600_FLASH = Asset(
19+
ASSET_BR2_202411_AST2600_FLASH = Asset(
2020
('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
21-
'images/ast2600-evb/buildroot-2023.11/flash.img'),
22-
'b62808daef48b438d0728ee07662290490ecfa65987bb91294cafb1bb7ad1a68')
21+
'images/ast2600-evb/buildroot-2024.11/flash.img'),
22+
'4bb2f3dfdea31199b51d66b42f686dc5374c144a7346fdc650194a5578b73609')
2323

2424
def test_arm_ast2600_evb_buildroot(self):
2525
self.set_machine('ast2600-evb')
2626

27-
image_path = self.ASSET_BR2_202311_AST2600_FLASH.fetch()
27+
image_path = self.ASSET_BR2_202411_AST2600_FLASH.fetch()
2828

2929
self.vm.add_args('-device',
3030
'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');

0 commit comments

Comments
 (0)