From e17fe6555902d8084442d84bb3f59a251ce1e49a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 25 Sep 2015 01:41:53 +0200
Subject: make: don't try to run `make[1]:`

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b34278ced..05780f80e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,11 @@ $(systems):
 else ifdef system
 .PHONY: deploy
 deploy:;@
-	make eval system=$(system) get=config.krebs.build.script filter=json | sh
+	make -s eval system=$(system) get=config.krebs.build.script filter=json | sh
 
 .PHONY: infest
 infest:;@
-	make eval system=$(system) get=config.krebs.build.infest filter=json | sh
+	make -s eval system=$(system) get=config.krebs.build.infest filter=json | sh
 
 .PHONY: eval
 eval:
-- 
cgit v1.2.3


From c9ccf22b154205caf55262ba6aa305e2c2247a02 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sun, 27 Sep 2015 00:22:50 +0200
Subject: krebs.build: merge deploy and infest

---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 05780f80e..3727793e8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # usage:
 #		make system=foo
 #		make systems='foo bar'
-#		make eval system=foo get=config.networking.extraHosts [filter=json]
+#		make eval get=tv.wu.config.time.timeZone [filter=json]
 #
 
 .ONESHELL:
@@ -10,20 +10,19 @@
 
 ifdef systems
 $(systems):
+	@
 	parallel \
 		--line-buffer \
 		-j0 \
 		--no-notice \
 		--tagstring {} \
-		-q make systems= system={} ::: $(systems)
+		-q make -s systems= system={} ::: $(systems)
 else ifdef system
-.PHONY: deploy
-deploy:;@
-	make -s eval system=$(system) get=config.krebs.build.script filter=json | sh
-
-.PHONY: infest
-infest:;@
-	make -s eval system=$(system) get=config.krebs.build.infest filter=json | sh
+.PHONY: deploy infest
+deploy infest:;@
+	export get=$$LOGNAME.${system}.config.krebs.build.scripts.$@
+	export filter=json
+	make -s eval | sh
 
 .PHONY: eval
 eval:
@@ -41,7 +40,7 @@ endif
 		-A "$$get" \
 		'<stockholm>' \
 		--argstr user-name "$$LOGNAME" \
-		--argstr system-name "$$system" \
+		--argstr host-name "$$HOSTNAME" \
 		| filter
 else
 $(error unbound variable: system[s])
-- 
cgit v1.2.3