From 561905bab707a3cb1928d3e1b977d824c1a2545a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 20 Nov 2025 16:33:18 +0100 Subject: [PATCH] projects-dir.mk: Fix empty JANWARE_USER error JW_BUILD_SSH_EXTRA_OPTS contains a -l $(JANWARE_USER), which make ssh break if $(JANWARE_USER) is empty. Fix that case. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 843c629a..2b84d96c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -89,7 +89,11 @@ else endif ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) - export JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER) + JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m + ifneq ($(JANWARE_USER),) + JW_BUILD_SSH_EXTRA_OPTS += -l $(JANWARE_USER) + endif + export JW_BUILD_SSH_EXTRA_OPTS endif ifneq ($(EXCLUDE_FROM_BUILD),)