From 9031e2717417f88b2d996254680f9e7bda6061e8 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Wed, 9 Sep 2015 13:25:25 +0500 Subject: [PATCH] cleanup build a little --- Makefile.docker | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.docker b/Makefile.docker index 8fe8b009..2ef5b262 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -36,7 +36,7 @@ $(DIST)/artifacts/initrd: bin/rancheros assets/docker $(BUILD)/kernel/ $(BUILD)/ DFS_IMAGE=$(DFS_IMAGE) ./scripts/mk-initrd.sh -$(DIST)/artifacts/rancheros.iso: $(DIST)/artifacts/initrd $(DIST)/artifacts/vmlinuz +$(DIST)/artifacts/rancheros.iso: minimal ./scripts/mk-rancheros-iso.sh @@ -47,18 +47,16 @@ $(DIST)/artifacts/iso-checksums.txt: $(DIST)/artifacts/rancheros.iso version: @echo $(VERSION) -installer: $(DIST)/artifacts/initrd $(DIST)/artifacts/vmlinuz +installer: minimal docker build -t $(IMAGE_NAME):$(VERSION) . -build-all: \ - installer \ - bin/rancheros \ - $(DIST)/artifacts/initrd \ - $(DIST)/artifacts/vmlinuz \ - $(DIST)/artifacts/rancheros.iso \ - $(DIST)/artifacts/iso-checksums.txt +build-all: minimal installer iso + +minimal: $(DIST)/artifacts/initrd $(DIST)/artifacts/vmlinuz + +iso: $(DIST)/artifacts/rancheros.iso $(DIST)/artifacts/iso-checksums.txt integration-tests: cd tests/integration && tox -.PHONY: build-all installer version bin/rancheros integration-tests +.PHONY: build-all minimal iso installer version bin/rancheros integration-tests