diff options
author | lassulus <lass@aidsballs.de> | 2015-09-27 20:08:36 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-09-27 20:08:36 +0200 |
commit | a9f6f7ac7b8e70633164d10980d1d041f34be3ac (patch) | |
tree | 13a8bdfafd994c999c5eeae3ff5e2537a4d96f0f /Makefile | |
parent | b6383dba83a2e9ec6ada40fb780c15a56c8d715e (diff) | |
parent | bc2bd6e2f6e9295b14e641b82bff62b40641988d (diff) |
Merge branch 'makefu'
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 -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]) |