From c0fe2b959dd97a1d98083cd9b1013e12adc0d5b3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 11 Sep 2016 12:02:06 +0100 Subject: [PATCH] fix Makefile dependencies Signed-off-by: Justin Cormack --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index bfa632937..4cb672508 100644 --- a/Makefile +++ b/Makefile @@ -10,19 +10,16 @@ alpine/kernel/x86_64/vmlinuz64: alpine/mobylinux-bios.iso: $(MAKE) -C alpine mobylinux-bios.iso -QEMU_DEPS=Dockerfile.qemu alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 -qemu: $(QEMU_DEPS) - tar cf - $(QEMU_DEPS) | docker build -f Dockerfile.qemu -t mobyqemu:build - +qemu: Dockerfile.qemu alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 + tar cf - $^ | docker build -f Dockerfile.qemu -t mobyqemu:build - docker run -it --rm mobyqemu:build -QEMU_ISO_DEPS=Dockerfile.qemuiso alpine/mobylinux-bios.iso -qemu-iso: $(TEST_DEPS) - tar cf - $(QEMU_ISO_DEPS) | docker build -f Dockerfile.qemuiso -t mobyqemuiso:build - +qemu-iso: Dockerfile.qemuiso alpine/mobylinux-bios.iso + tar cf - $^ | docker build -f Dockerfile.qemuiso -t mobyqemuiso:build - docker run -it --rm mobyqemuiso:build -TEST_DEPS=Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 -test: $(TEST_DEPS) - tar cf - $(TEST_DEPS) | docker build -f Dockerfile.test -t mobytest:build - +test: Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 + tar cf - $^ | docker build -f Dockerfile.test -t mobytest:build - touch test.log docker run --rm mobytest:build 2>&1 | tee -a test.log & tail -f test.log 2>/dev/null | grep -m 1 -q 'Moby test suite '