do not force rebuild from top level makefile

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-11 11:28:07 +01:00 committed by Justin Cormack
parent 43ab6520cf
commit 18912fa3b5

View File

@ -1,20 +1,28 @@
all: all:
$(MAKE) -C alpine/kernel
$(MAKE) -C alpine $(MAKE) -C alpine
qemu: all alpine/initrd.img.gz:
tar cf - Dockerfile.qemu alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 | \ $(MAKE) -C alpine initrd.img.gz
docker build -f Dockerfile.qemu -t mobyqemu:build -
alpine/kernel/x86_64/vmlinuz64:
$(MAKE) -C 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 -
docker run -it --rm mobyqemu:build docker run -it --rm mobyqemu:build
qemu-iso: all QEMU_ISO_DEPS=Dockerfile.qemuiso alpine/mobylinux-bios.iso
$(MAKE) -C alpine mobylinux-bios.iso qemu-iso: $(TEST_DEPS)
docker build -f Dockerfile.qemuiso -t mobyqemuiso:build . tar cf - $(QEMU_ISO_DEPS) | docker build -f Dockerfile.qemuiso -t mobyqemuiso:build -
docker run -it --rm mobyqemuiso:build docker run -it --rm mobyqemuiso:build
test: Dockerfile.test all TEST_DEPS=Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64
tar cf - Dockerfile.test alpine/initrd.img.gz alpine/kernel/x86_64/vmlinuz64 | \ test: $(TEST_DEPS)
docker build -f Dockerfile.test -t mobytest:build - tar cf - $(TEST_DEPS) | docker build -f Dockerfile.test -t mobytest:build -
touch test.log touch test.log
docker run --rm mobytest:build 2>&1 | tee -a 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 ' tail -f test.log 2>/dev/null | grep -m 1 -q 'Moby test suite '