Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
lassulus 2016-10-06 07:44:55 +02:00
commit 61ada606d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -51,8 +51,6 @@ $(if $(target_user),,$(error unbound variable: target_user))
$(if $(target_port),,$(error unbound variable: target_port)) $(if $(target_port),,$(error unbound variable: target_port))
$(if $(target_path),,$(error unbound variable: target_path)) $(if $(target_path),,$(error unbound variable: target_path))
target ?= $(target_user)@$(target_host):$(target_port)$(target_path)
build = \ build = \
nix-build \ nix-build \
--no-out-link \ --no-out-link \
@ -88,6 +86,8 @@ deploy:
nixos-rebuild $(rebuild-command) --show-trace -I $(target_path) nixos-rebuild $(rebuild-command) --show-trace -I $(target_path)
# usage: make populate system=foo # usage: make populate system=foo
populate: populate-target = \
$(target_user)@$(target_host):$(target_port)$(target_path)
ifeq ($(debug),true) ifeq ($(debug),true)
populate: populate-flags += --debug populate: populate-flags += --debug
endif endif
@ -96,7 +96,7 @@ populate: populate-flags += --ssh=$(ssh)
endif endif
populate: populate:
$(call evaluate,config.krebs.build.source) --json --strict | \ $(call evaluate,config.krebs.build.source) --json --strict | \
populate $(target) $(populate-flags) populate $(populate-target) $(populate-flags)
# usage: make pkgs.populate # usage: make pkgs.populate
pkgs:;@$(error no package selected) pkgs:;@$(error no package selected)