From 28d623cf98b5d5b0f23b1b7761c884b8631b8f78 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 May 2016 02:52:23 +0200
Subject: Makefile: disable default goal

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7252ca70e..58a46c643 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,10 @@ execute = \
 	script=$$(echo "$$result" | jq -r .) && \
 	echo "$$script" | PS5=% sh
 
+ifeq ($(MAKECMDGOALS),)
+$(error No goals specified)
+endif
+
 # usage: make deploy system=foo [target_host=bar]
 deploy: ssh ?= ssh
 deploy:
-- 
cgit v1.2.3


From 47a9308fc9eb41f7fe1f5d160a45e6a23e9f12d1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 May 2016 03:02:35 +0200
Subject: Makefile evaluate: provide access to all of stockholm

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 58a46c643..d3823077e 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,7 @@ evaluate = \
 		--show-trace \
 		-I nixos-config=$(nixos-config) \
 		-I stockholm=$(stockholm) \
-		-E '{ eval, f }: f eval' \
-		--arg eval 'import ./.' \
-		--arg f "eval@{ config, ... }: $(1)"
+		-E "let eval = import <stockholm>; in with eval; $(1)"
 
 execute = \
 	result=$$($(call evaluate,config.krebs.build.$(1))) && \
@@ -77,7 +75,7 @@ deploy:
 
 # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name
 eval eval.:;@$(call evaluate,$${expr-eval})
-eval.%:;@$(call evaluate,$*)
+eval.%:;@$(call evaluate,$@)
 
 # usage: make install system=foo [target_host=bar]
 install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
-- 
cgit v1.2.3


From 8014be4f2e0a5d9091150d2e4944706c31e4a62d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 May 2016 03:21:56 +0200
Subject: Makefile system: add default value

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d3823077e..a74e3a877 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ export STOCKHOLM_VERSION ?= $(shell \
 	printf '%s' "$$date.$$version"; \
 )
 
+system ?= $(HOSTNAME)
 $(if $(system),,$(error unbound variable: system))
 
 nixos-config ?= $(stockholm)/$(LOGNAME)/1systems/$(system).nix
-- 
cgit v1.2.3