diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-19 12:32:12 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-19 12:32:12 +0200 |
| commit | 0868101f2adc00f4e13a4ea242dc3bd23070917f (patch) | |
| tree | a155571c2c448e51e5b1461228d7b46dda64a07f /Makefile | |
| parent | ccd89b19f3fbbb6acb94be8f9f54d4e673ee33dc (diff) | |
| parent | ce58a50de30fd49d4c000a81f9b7ce9baf0ccd66 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -51,8 +51,6 @@ $(if $(target_user),,$(error unbound variable: target_user)) $(if $(target_port),,$(error unbound variable: target_port)) $(if $(target_path),,$(error unbound variable: target_path)) -target ?= $(target_user)@$(target_host):$(target_port)$(target_path) - build = \ nix-build \ --no-out-link \ @@ -88,6 +86,8 @@ deploy: nixos-rebuild $(rebuild-command) --show-trace -I $(target_path) # usage: make populate system=foo +populate: populate-target = \ + $(target_user)@$(target_host):$(target_port)$(target_path) ifeq ($(debug),true) populate: populate-flags += --debug endif @@ -96,7 +96,7 @@ populate: populate-flags += --ssh=$(ssh) endif populate: $(call evaluate,config.krebs.build.source) --json --strict | \ - populate $(target) $(populate-flags) + populate $(populate-target) $(populate-flags) # usage: make pkgs.populate pkgs:;@$(error no package selected) |