From d954dd5e192834a72a2d05b428fc0e8cef599c31 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 19:48:16 +0100 Subject: Makefile: interpolate $(target_*) for a nicer log --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e61d16b75..9ed045e4d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ export target_path ?= /var/src evaluate = \ nix-instantiate \ - --arg configuration "./$$LOGNAME/1systems/$$system.nix" \ + --arg configuration ./$(LOGNAME)/1systems/$(system).nix \ --eval \ --readonly-mode \ --show-trace \ @@ -22,7 +22,7 @@ execute = \ # usage: make deploy system=foo [target_host=bar] deploy: $(call execute,populate) - @set -x; ssh "$$target_user@$$target_host" nixos-rebuild switch -I "$$target_path" + ssh $(target_user)@$(target_host) nixos-rebuild switch -I $(target_path) # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate) -- cgit v1.2.3 From 1497ee718256ff48c65ebcb0ddea633c6628eb69 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 19:56:04 +0100 Subject: Makefile: enable "make install" --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9ed045e4d..f39ed0c02 100644 --- a/Makefile +++ b/Makefile @@ -28,14 +28,13 @@ deploy: eval eval.:;@$(call evaluate) eval.%:;@$(call evaluate,-A $*) -## usage: make install system=foo target= -#.PHONY: install -#install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -#install:;@set -x -# $(ssh) "$$target_user@$$target_host" \ -# env target_path="$target_path" \ -# sh -s prepare < krebs/4lib/infest/prepare.sh -# make -s populate target_path=/mnt"$$target_path" -# $(ssh) "$$target_user@$$target_host" \ -# env NIXOS_CONFIG=/var/src/nixos-config \ -# nixos-install +# usage: make install system=foo [target_host=bar] +install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null +install: + $(ssh) $(target_user)@$(target_host) \ + env target_path=$(target_path) \ + sh -s prepare < krebs/4lib/infest/prepare.sh + target_path=/mnt$(target_path) $(call execute,populate) + $(ssh) $(target_user)@$(target_host) \ + env NIXOS_CONFIG=$(target_path)/nixos-config \ + nixos-install -- cgit v1.2.3 From c338330f066e3fe6903158ad6536d71a70cf1daa Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 23:20:50 +0100 Subject: make install: make ssh configurable --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f39ed0c02..a25b90771 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ eval eval.:;@$(call evaluate) eval.%:;@$(call evaluate,-A $*) # usage: make install system=foo [target_host=bar] -install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null +install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null install: $(ssh) $(target_user)@$(target_host) \ env target_path=$(target_path) \ -- cgit v1.2.3 From 411aec6bf9d1b53813e693f22b77972a00ce9078 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 13 Feb 2016 16:03:40 +0100 Subject: deploy,install,populate: admit target SSH port --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a25b90771..c7dee134c 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ endif export target_host ?= $(system) export target_user ?= root +export target_port ?= 22 export target_path ?= /var/src evaluate = \ @@ -22,7 +23,8 @@ execute = \ # usage: make deploy system=foo [target_host=bar] deploy: $(call execute,populate) - ssh $(target_user)@$(target_host) nixos-rebuild switch -I $(target_path) + ssh $(target_user)@$(target_host) -p $(target_port) \ + nixos-rebuild switch -I $(target_path) # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate) @@ -31,10 +33,10 @@ eval.%:;@$(call evaluate,-A $*) # usage: make install system=foo [target_host=bar] install: ssh ?= ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null install: - $(ssh) $(target_user)@$(target_host) \ + $(ssh) $(target_user)@$(target_host) -p $(target_port) \ env target_path=$(target_path) \ sh -s prepare < krebs/4lib/infest/prepare.sh target_path=/mnt$(target_path) $(call execute,populate) - $(ssh) $(target_user)@$(target_host) \ + $(ssh) $(target_user)@$(target_host) -p $(target_port) \ env NIXOS_CONFIG=$(target_path)/nixos-config \ nixos-install -- cgit v1.2.3 From 6150679d748c1996694011ba20b8c0a27004f955 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 14 Feb 2016 13:27:42 +0100 Subject: make deploy: --show-trace --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c7dee134c..e5e3b19d5 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ execute = \ deploy: $(call execute,populate) ssh $(target_user)@$(target_host) -p $(target_port) \ - nixos-rebuild switch -I $(target_path) + nixos-rebuild switch --show-trace -I $(target_path) # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate) -- cgit v1.2.3 From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:27:11 +0100 Subject: don't try to mimic nixpkgs --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e5e3b19d5..384c872ab 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,11 @@ export target_path ?= /var/src evaluate = \ nix-instantiate \ - --arg configuration ./$(LOGNAME)/1systems/$(system).nix \ --eval \ --readonly-mode \ --show-trace \ + -I nixos-config=./$(LOGNAME)/1systems/$(system).nix \ + -I stockholm=. \ $(1) execute = \ -- cgit v1.2.3