test-efi-create-disk.sh: allow running from separate build dir, hook up to meson
This allow test-efi-disk.img to be created under meson. The invocation of qemu is not converted yet, in particular because the command-line used in Makefile.am is outdated.
This commit is contained in:
parent
fdd147a88e
commit
d83f4f506d
|
@ -3077,8 +3077,8 @@ CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
CLEANFILES += test-efi-disk.img
|
CLEANFILES += test-efi-disk.img
|
||||||
|
|
||||||
test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh
|
test-efi-disk.img: $(systemd_boot) $(stub) test/splash.bmp test/test-efi-create-disk.sh
|
||||||
$(AM_V_GEN)test/test-efi-create-disk.sh
|
$(AM_V_GEN)test/test-efi-create-disk.sh $@ $(systemd_boot) $(stub) test/splash.bmp
|
||||||
|
|
||||||
test-efi: test-efi-disk.img
|
test-efi: test-efi-disk.img
|
||||||
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
|
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
|
||||||
|
|
|
@ -410,6 +410,8 @@ etags = find_program('etags', required : false)
|
||||||
meson_make_symlink = meson.source_root() + '/tools/meson-make-symlink.sh'
|
meson_make_symlink = meson.source_root() + '/tools/meson-make-symlink.sh'
|
||||||
mkdir_p = 'mkdir -p $DESTDIR/@0@'
|
mkdir_p = 'mkdir -p $DESTDIR/@0@'
|
||||||
check_compilation_sh = find_program('tools/meson-check-compilation.sh')
|
check_compilation_sh = find_program('tools/meson-check-compilation.sh')
|
||||||
|
test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
|
||||||
|
splash_bmp = files('test/splash.bmp')
|
||||||
|
|
||||||
# if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
|
# if -Dxxx-path option is found, use that. Otherwise, check in $PATH,
|
||||||
# /usr/sbin, /sbin, and fall back to the default from middle column.
|
# /usr/sbin, /sbin, and fall back to the default from middle column.
|
||||||
|
|
|
@ -158,7 +158,7 @@ if have_gnu_efi
|
||||||
no_undefined_symbols,
|
no_undefined_symbols,
|
||||||
args : [so])
|
args : [so])
|
||||||
|
|
||||||
custom_target(
|
stub = custom_target(
|
||||||
tuple[1],
|
tuple[1],
|
||||||
input : so,
|
input : so,
|
||||||
output : tuple[1],
|
output : tuple[1],
|
||||||
|
@ -175,5 +175,18 @@ if have_gnu_efi
|
||||||
['@INPUT@', '@OUTPUT@'],
|
['@INPUT@', '@OUTPUT@'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : bootlibdir)
|
install_dir : bootlibdir)
|
||||||
|
|
||||||
|
set_variable(tuple[0].underscorify(), so)
|
||||||
|
set_variable(tuple[0].underscorify() + '_stub', stub)
|
||||||
endforeach
|
endforeach
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
############################################################
|
||||||
|
|
||||||
|
if have_gnu_efi
|
||||||
|
test_efi_disk_img = custom_target(
|
||||||
|
'test-efi-disk.img',
|
||||||
|
input : [systemd_boot_so, stub_so_stub],
|
||||||
|
output : 'test-efi-disk.img',
|
||||||
|
command : [test_efi_create_disk_sh, '@OUTPUT@', '@INPUT0@', '@INPUT1@', splash_bmp])
|
||||||
|
endif
|
||||||
|
|
|
@ -1,30 +1,38 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
|
|
||||||
|
out="$1"
|
||||||
|
systemd_efi="$2"
|
||||||
|
boot_stub="$3"
|
||||||
|
splash_bmp="$4"
|
||||||
|
if [ -z "$out" -o -z "$systemd_efi" -o -z "$boot_stub" -o -z "$splash_bmp" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# create GPT table with EFI System Partition
|
# create GPT table with EFI System Partition
|
||||||
rm -f test-efi-disk.img
|
rm -f "$out"
|
||||||
dd if=/dev/null of=test-efi-disk.img bs=1M seek=512 count=1
|
dd if=/dev/null of="$out" bs=1M seek=512 count=1 status=none
|
||||||
parted --script test-efi-disk.img "mklabel gpt" "mkpart ESP fat32 1MiB 511MiB" "set 1 boot on"
|
parted --script "$out" "mklabel gpt" "mkpart ESP fat32 1MiB 511MiB" "set 1 boot on"
|
||||||
|
|
||||||
# create FAT32 file system
|
# create FAT32 file system
|
||||||
LOOP=$(losetup --show -f -P test-efi-disk.img)
|
LOOP=$(losetup --show -f -P "$out")
|
||||||
mkfs.vfat -F32 ${LOOP}p1
|
mkfs.vfat -F32 ${LOOP}p1
|
||||||
mkdir -p mnt
|
mkdir -p mnt
|
||||||
mount ${LOOP}p1 mnt
|
mount ${LOOP}p1 mnt
|
||||||
|
|
||||||
mkdir -p mnt/EFI/{BOOT,systemd}
|
mkdir -p mnt/EFI/{BOOT,systemd}
|
||||||
cp systemd-bootx64.efi mnt/EFI/BOOT/BOOTX64.efi
|
cp "$systemd_efi" mnt/EFI/BOOT/BOOTX64.efi
|
||||||
|
|
||||||
[ -e /boot/shellx64.efi ] && cp /boot/shellx64.efi mnt/
|
[ -e /boot/shellx64.efi ] && cp /boot/shellx64.efi mnt/
|
||||||
|
|
||||||
mkdir mnt/EFI/Linux
|
mkdir mnt/EFI/Linux
|
||||||
echo -n "foo=yes bar=no root=/dev/fakeroot debug rd.break=initqueue" > mnt/cmdline.txt
|
echo -n "foo=yes bar=no root=/dev/fakeroot debug rd.break=initqueue" >mnt/cmdline.txt
|
||||||
objcopy \
|
objcopy \
|
||||||
--add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
|
--add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
|
||||||
--add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \
|
--add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \
|
||||||
--add-section .splash=test/splash.bmp --change-section-vma .splash=0x40000 \
|
--add-section .splash="$splash_bmp" --change-section-vma .splash=0x40000 \
|
||||||
--add-section .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x2000000 \
|
--add-section .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x2000000 \
|
||||||
--add-section .initrd=/boot/$(cat /etc/machine-id)/$(uname -r)/initrd --change-section-vma .initrd=0x3000000 \
|
--add-section .initrd=/boot/$(cat /etc/machine-id)/$(uname -r)/initrd --change-section-vma .initrd=0x3000000 \
|
||||||
linuxx64.efi.stub mnt/EFI/Linux/linux-test.efi
|
"$boot_stub" mnt/EFI/Linux/linux-test.efi
|
||||||
|
|
||||||
# install entries
|
# install entries
|
||||||
mkdir -p mnt/loader/entries
|
mkdir -p mnt/loader/entries
|
||||||
|
|
Loading…
Reference in New Issue