From 9e6c267fb14a6c4547f6d09359b406cdb4395c08 Mon Sep 17 00:00:00 2001 From: Samuel Aubertin Date: Wed, 7 Feb 2024 07:50:26 +0100 Subject: [PATCH] Add release path --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e446d48..f0ec9ea 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ include ../skz-opack/src/opack.mk .PHONY: sync provision cleanrelease halt -RELEASE_PATH= release SRC_REPO= ../skzbsd-src -BRANCH= master -TARGET= SKZ-VIRT +BRANCH?= master +TARGET?= SKZ-VIRT +RELEASE_PATH= release-$(BRANCH) cleanrelease: rm -rf $(RELEASE_PATH) @@ -36,10 +36,13 @@ provision: sync $(RELEASE_PATH): provision mkdir -p $@ - vagrant ssh -c "BUILD_TARGET=$(TARGET) TAG=$(BRANCH) make -C build/release all" || vagrant ssh -c "cat /var/log/master_build.log.err" - scp -F ssh-config -q -r $(OPACK_TARGET):'/home/build/master/*' $@ + vagrant ssh -c "BUILD_TARGET=$(TARGET) TAG=$(BRANCH) make -C build/release all" || vagrant ssh -c "cat /var/log/$(BRANCH)_build.log.err" + scp -F ssh-config -q -r $(OPACK_TARGET):'/home/build/$(BRANCH)/*' $@ halt: $(RELEASE_PATH) vagrant halt all: halt + +clean: + $(MAKE) opack-clean