diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-16 18:04:46 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 03:47:29 +0200 |
commit | d83f4f506d560fb67add370f49510b9c55c467c8 (patch) | |
tree | 256ecf0c75a3282eaeed0db1460e306d81628e09 /Makefile.am | |
parent | meson: add dist-check-includes replacement (diff) | |
download | systemd-d83f4f506d560fb67add370f49510b9c55c467c8.tar.xz systemd-d83f4f506d560fb67add370f49510b9c55c467c8.zip |
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 18f4accb4f..ea5883bf01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3077,8 +3077,8 @@ CLEANFILES += $(stub_objects) $(stub_solib) $(stub) # ------------------------------------------------------------------------------ CLEANFILES += test-efi-disk.img -test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh - $(AM_V_GEN)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 $@ $(systemd_boot) $(stub) test/splash.bmp test-efi: test-efi-disk.img $(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img |