summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-06 07:44:55 +0200
committerlassulus <lass@aidsballs.de>2016-10-06 07:44:55 +0200
commit61ada606d8ee39c7f3f00be156af7843a6dfc16b (patch)
treeee666a73bc7dcc0135bc2c02824b1cc43c782e2f
parent4d7df5a4ee8cfa3fd1524b9442fefa3b0e3aebe7 (diff)
parented6c2d9a0966ee067a0dd8a9346e450c97154c23 (diff)
Merge remote-tracking branch 'cd/master'
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 4fa5bc88..09f6eafd 100644
--- a/Makefile
+++ b/Makefile
@@ -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)