From 96ae43d7cc569274488aaf117d793bb504558d51 Mon Sep 17 00:00:00 2001 From: Manuel Messner Date: Tue, 20 Feb 2018 12:50:15 +0100 Subject: Makefile: add spacing --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cf64a4e..8d2a761 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ # * testing target PACKER ?= packer ANSIBLE_DIR ?= ansible-roles - HASHER ?= sha256sum - SHELL := /usr/bin/env bash + + ARCH := $(shell uname -m | sed 's/i686/i386/') BUILDER_QEMU_EXE := qemu-system-$(ARCH) @@ -41,16 +41,19 @@ PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $ BOOTTARGETS := $(foreach template, $(TEMPLATES), $(template)/base/boot) BOOTTARGETS += $(foreach prov, $(PROVTARGETS), $(prov)/boot) + override PACKER_OPTS += -var-file=base.json ifdef DEBUG VERBOSE := 1 override PACKER_OPTS += -debug endif + ifdef WINDOW override PACKER_OPTS += -var='headless=false' endif + # We support parallel Provisioning packer builds. # To ensure data consistency we save the used ansible roles before executing in # its own environment, tagged by the current date & time. @@ -158,14 +161,17 @@ clean_except_last: -not -wholename $(template)/$$(readlink $(template)/$(flavor).latest) \ -print0 | xargs -0 rm -rf);) + clean_bases: @-$(foreach template,$(TEMPLATES),\ test -d $(template) && rm -rf $(template)/base;) + clean_all: @-$(foreach template,$(TEMPLATES),\ test -d $(template) && rm -rf $(template);) + help: @printf "Usage:\n\tmake