X Tutup
Skip to content

Commit b2ba851

Browse files
medhefgomedhefgo
committed
meson: Remove test-efi-create-disk.sh
The script was probably not used for a very long time. It is currently passed systemd_boot.so as boot loader, which cannot work. The test entries it creates are all pointing at non-existant efi/linux binaries, which means they would not even show up in the menu if the created image were actually booted. There is also nothing that actually tries to run the image in the first place. If we end up creating a proper systemd-boot test suite, it would be better to start from scratch. In the meantime, mkosi already covers the bare minimum with a simple bootup test.
1 parent e3f7ed9 commit b2ba851

File tree

4 files changed

+1
-68
lines changed

4 files changed

+1
-68
lines changed

‎meson.build‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,10 +599,8 @@ env = find_program('env')
599599
perl = find_program('perl', required : false)
600600
rsync = find_program('rsync', required : false)
601601
meson_make_symlink = project_source_root + '/tools/meson-make-symlink.sh'
602-
test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
603602

604603
mkdir_p = 'mkdir -p $DESTDIR/@0@'
605-
splash_bmp = files('test/splash.bmp')
606604

607605
# If -Dxxx-path option is found, use that. Otherwise, check in $PATH,
608606
# /usr/sbin, /sbin, and fall back to the default from middle column.

‎src/boot/efi/meson.build‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(efi_arch[0])
401401
stub_elf_name = 'linux@0@.elf.stub'.format(efi_arch[0])
402402
stub_efi_name = 'linux@0@.efi.stub'.format(efi_arch[0])
403403

404-
efi_stubs = []
405404
foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects, false],
406405
[stub_elf_name, stub_efi_name, stub_objects, true]]
407406
so = custom_target(
@@ -419,7 +418,7 @@ foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects
419418
install : tuple[3],
420419
install_dir : bootlibdir)
421420

422-
stub = custom_target(
421+
custom_target(
423422
tuple[1],
424423
input : so,
425424
output : tuple[1],
@@ -439,14 +438,4 @@ foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects
439438
'@INPUT@', '@OUTPUT@'],
440439
install : true,
441440
install_dir : bootlibdir)
442-
443-
efi_stubs += [[so, stub]]
444441
endforeach
445-
446-
############################################################
447-
448-
test_efi_disk_img = custom_target(
449-
'test-efi-disk.img',
450-
input : [efi_stubs[0][0], efi_stubs[1][1]],
451-
output : 'test-efi-disk.img',
452-
command : [test_efi_create_disk_sh, '@OUTPUT@','@INPUT@', splash_bmp])

‎test/splash.bmp‎

-282 KB
Binary file not shown.

‎test/test-efi-create-disk.sh‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup