summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b6d4cb8..e896904 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,13 @@
# TODO
# * support ssh as user instead of root
# * testing target
-PACKER ?= packer
-ANSIBLE_DIR ?= ansible-roles
+PACKER ?= packer
+ANSIBLE_DIR ?= ansible-roles
-HASHER ?= sha256sum
+HASHER ?= sha256sum
-SHELL := /usr/bin/env bash
-ARCH := $(shell uname -m | sed 's/i686/i386/')
+SHELL := /usr/bin/env bash
+ARCH := $(shell uname -m | sed 's/i686/i386/')
BUILDER_QEMU_EXE := qemu-system-$(ARCH)
BUILDER_QEMU_NAME := qemu
@@ -41,7 +41,6 @@ PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $
BOOTTARGETS := $(foreach template, $(TEMPLATES), $(template)/base/boot)
BOOTTARGETS += $(foreach prov, $(PROVTARGETS), $(prov)/boot)
-
PACKER_OPTS += -var-file=base.json
ifdef DEBUG
VERBOSE := 1