diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
| commit | 400dab8254aa175213df8f6bd5ed391d80c7d827 (patch) | |
| tree | bcd035856f0a8da4a80cbbaa897f2605f57e11f8 /Makefile | |
| parent | 394408c9b715a2dfb6aba560c4db71b78cf46f8d (diff) | |
| parent | 95f1673f1f50384682815effa675e5ef5c68847e (diff) | |
Merge remote-tracking branch 'cd/master' into before-merge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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 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 +.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]) |