From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28B39190052 for ; Wed, 5 Feb 2025 15:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770779; cv=none; b=b5/V+pEym0XmHK1MZjaCp9MwwcdSoAytaS2QJLVFm13+fSORgK8tZaPgYb7RlL3tycTrvV+ax7GhHBe2kgMXMlmE2BH+ND9j53AhGn2HnRb/1/2aJHDR/xijQ7Pp6l0Y4jukqyxf6DJ6UoRQkfvmm1sj7G36Rotl4nX2QR6OkJ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770779; c=relaxed/simple; bh=8h4TMzEgKV0tLTw+eUegJEAiS+P9kzCCu0yOMv8D+VQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OVUNd4MFaE4IoWfxnCRT6FqlreIgQGjjgXPrlj3U0wjyWZfFk/VZ2tMZas78KhV91b3xahggfP0zkdGm9GM4pwOV/DICKo5GRpETzVZaYti8x5oSeMryKmYdl/qUts/rwqH2c/G9HJLM97vkl91XIVIcfxmQ7SN4FHjSPd51lh0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KxVsvDva; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KxVsvDva" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B93F4C4CED6; Wed, 5 Feb 2025 15:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738770779; bh=8h4TMzEgKV0tLTw+eUegJEAiS+P9kzCCu0yOMv8D+VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KxVsvDvaLMSYRTPcg6pkabnJLGSH4VYz4RR2IEX0MBv4hmxA+zd8mtB5c3rWahJpG /xnfNsjC+DjrxlZ9FXJXFroUrVQocY9gUZzw0y7DoBtpz3B+xKzB/oOn+bC4eLc8LG 3tOmXK6mFRf+IBgnMFuQvrPakGWAWwYiqtKfVtHhoetQ/Iw2AUpfmc0Q2z6U4gU9WH KDXSPBIzE9attD8LXah9lrr4f4CM3YE9RKmNjrLQScU1eSbwPeP2/O+k9onju8nbky cTNzscwQat4iuF5gphdHHX/XeQDZ228/JTcLxL2zBOc07PopxHDmooq6Q//DHJy9Xd r3PPfj8KLVC2A== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v2 08/12] ssh.Makefile: Define a kdevops_ssh_config variable Date: Wed, 5 Feb 2025 10:52:48 -0500 Message-ID: <20250205155252.1317763-9-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205155252.1317763-1-cel@kernel.org> References: <20250205155252.1317763-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Create a global variable that contains the pathname of the config file that stores ephemeral ssh host entries. That way the scripts don't have to keep creating this pathname. Signed-off-by: Chuck Lever --- scripts/ssh.Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile index 150001d8bbbd..58ffe1e05d68 100644 --- a/scripts/ssh.Makefile +++ b/scripts/ssh.Makefile @@ -7,10 +7,19 @@ ANSIBLE_EXTRA_ARGS += kexalgorithms=$(SSH_KEXALGORITHMS) endif ifeq (y,$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)) + SSH_CONFIG_FILE:=$(subst ",,$(CONFIG_KDEVOPS_SSH_CONFIG)) ANSIBLE_EXTRA_ARGS += sshconfig=$(CONFIG_KDEVOPS_SSH_CONFIG) ANSIBLE_EXTRA_ARGS += sshdir=$(shell dirname $(SSH_CONFIG_FILE)) + +ifeq (y,$(CONFIG_TOPDIR_PATH_HAS_SHA256SUM)) +SSH_CONFIG_SUFFIX:=$(CONFIG_TOPDIR_PATH_SHA256SUM) +else +SSH_CONFIG_SUFFIX:=$(CONFIG_KDEVOPS_HOST_PREFIX) endif +ANSIBLE_EXTRA_ARGS += kdevops_ssh_config=$(CONFIG_KDEVOPS_SSH_CONFIG)_kdevops_$(SSH_CONFIG_SUFFIX) + +endif # CONFIG_KDEVOPS_SSH_CONFIG_UPDATE PHONY += remove-ssh-key remove-ssh-key: -- 2.48.1