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 71B3D2DAFD2 for ; Tue, 2 Sep 2025 13:54:46 +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=1756821286; cv=none; b=YEF/BkKt5fC2Fc8LFjZB9jXai+R39aQzhltYoiim/CTZPnt6kvCSQiKZkHA0aRVL9OPOH9cyR6OOsfBQ64ctGkHYxkc77YT7+Rzp2mgZ82SOdoQsjy4xEZJ6c3gc+uCsmyLSfaXSOkjDjMmxgYwQRYYp5dHvfwEIqkP5S5HODA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756821286; c=relaxed/simple; bh=svdMFSGbzcKXVN2doRGvl2mS57TyPs4biQ/BXZeZ4Ig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IAD7HRU55PV4ib+MaoB+5mVTToIQ+BigCCrpDN/ud7bsK3Lf1noeskInTZnZw6i0UDYTswXqSVq155tWssgXwY0tUXLiJobpg3H6O5AmPTltntmGfICY+3DkKYsLhh+bd8zQ48aGZF/+5NlvCPsWLASqEt2+LEYMLVcNHn/5qDU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UQMJ+67R; 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="UQMJ+67R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DC53C4CEF6; Tue, 2 Sep 2025 13:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756821286; bh=svdMFSGbzcKXVN2doRGvl2mS57TyPs4biQ/BXZeZ4Ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQMJ+67RJr/0LhOW7fXyxGzTxmrt5ZcMekBvqojKwE7YhoC7q5cCo1FCDQyRDnq5x eT2c2ZQMIajDDDDvyMJTptaP5XfYABnjvaALCJoXl/xtA/rDyPlWwB15XEYeAKsLdT YVg/lTzF1F2SAa0+3DTsRhoOuV+CzvRJdHWrizv+S7q4DrDxd2I43/DNMiN3i3xqM1 1QZrpKB8lOKzRtaXdQcZa/RO7LbyTzCNX3YG/Hz7mDhrQDjF6RFD+EzUk+G7BUx3KW s/t9+2ezF4CDNCU4m1TuOpxzvb9isbbh6lOiu0Q2yoYCOJJnXi1yq5ET4gmkVOKUPz bezsSsdLggXVQ== From: Chuck Lever To: Cc: Chuck Lever Subject: [PATCH v2 35/37] Makefile: Set TOPDIR_PATH and generate its sha256sum at run time Date: Tue, 2 Sep 2025 09:54:22 -0400 Message-ID: <20250902135426.815079-36-cel@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902135426.815079-1-cel@kernel.org> References: <20250902135426.815079-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 Commit 42d27579a9d0 ("guestfs: enhance ssh config choice") added a uniquifier to the name of the ssh config to avoid multiple kdevops runs clobbering each other's ssh config entries. It uses the TOPDIR pathname set in the current .config to benefit from the nice convenience of generating an Ansible extra_var using "output yaml". Commit 42d27579a9d0 ("guestfs: enhance ssh config choice") broke the ability to share a .config with other users because CONFIG_TOPDIR_PATH contains a fixed string pointing to the home directory where the .config was created. The TOPDIR and its checksum need to be generated not by "make menuconfig" but rather by "make" in order that .config files (as saved in defconfigs/) can be truly portable. Signed-off-by: Chuck Lever --- Kconfig | 10 ---------- Makefile | 2 ++ scripts/gen-hosts.Makefile | 1 + scripts/ssh.Makefile | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Kconfig b/Kconfig index 54921617b8b2..948befbce4de 100644 --- a/Kconfig +++ b/Kconfig @@ -5,16 +5,6 @@ mainmenu "$(PROJECT) $(PROJECTRELEASE)" -config TOPDIR_PATH - string - output yaml - default $(shell, echo $TOPDIR_PATH) - -config TOPDIR_PATH_SHA256SUM - string - output yaml - default $(shell, ./scripts/compute_sha256sum.sh $(TOPDIR_PATH)) - config HAVE_KDEVOPS_CUSTOM_DEFAULTS bool default n diff --git a/Makefile b/Makefile index 83c67340d0ce..a9cba02c0829 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ export KDEVOPS_NODES := export PYTHONUNBUFFERED=1 export TOPDIR=./ export TOPDIR_PATH = $(shell readlink -f $(TOPDIR)) +export TOPDIR_PATH_SHA256SUM = $(shell ./scripts/compute_sha256sum.sh $(TOPDIR_PATH)) include scripts/refs.Makefile KDEVOPS_NODES_ROLE_TEMPLATE_DIR := $(KDEVOPS_PLAYBOOKS_DIR)/roles/gen_nodes/templates @@ -82,6 +83,7 @@ INCLUDES = -I include/ CFLAGS += $(INCLUDES) ANSIBLE_EXTRA_ARGS += kdevops_version='$(PROJECTRELEASE)' +ANSIBLE_EXTRA_ARGS += topdir_path_sha256sum='$(TOPDIR_PATH_SHA256SUM)' export KDEVOPS_HOSTS_TEMPLATE := hosts.j2 diff --git a/scripts/gen-hosts.Makefile b/scripts/gen-hosts.Makefile index 0d1e0cd77c2e..c809b1da18e5 100644 --- a/scripts/gen-hosts.Makefile +++ b/scripts/gen-hosts.Makefile @@ -3,6 +3,7 @@ KDEVOPS_PLAYBOOKS_DIR_FULL_PATH=$(TOPDIR_PATH)/$(KDEVOPS_PLAYBOOKS_DIR) KDEVOPS_HOSTS_TEMPLATE_DIR=$(KDEVOPS_PLAYBOOKS_DIR_FULL_PATH)/roles/gen_hosts/templates +GENHOSTS_EXTRA_ARGS += topdir_path='$(TOPDIR_PATH)' GENHOSTS_EXTRA_ARGS += kdevops_playbooks_dir='$(KDEVOPS_PLAYBOOKS_DIR)' # Relative path so that ansible can work with it diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile index 68c6dcdd4dcd..82e9a8dd33b5 100644 --- a/scripts/ssh.Makefile +++ b/scripts/ssh.Makefile @@ -10,7 +10,7 @@ ifeq (y,$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)) SSH_CONFIG_FILE:=$(subst ",,$(CONFIG_KDEVOPS_SSH_CONFIG)) ANSIBLE_EXTRA_ARGS += sshconfig=$(shell realpath $(SSH_CONFIG_FILE)) -ANSIBLE_EXTRA_ARGS += kdevops_ssh_config=$(shell scripts/append-makefile-vars.sh $(CONFIG_KDEVOPS_SSH_CONFIG_PREFIX) $(CONFIG_TOPDIR_PATH_SHA256SUM)) +ANSIBLE_EXTRA_ARGS += kdevops_ssh_config=$(shell scripts/append-makefile-vars.sh $(CONFIG_KDEVOPS_SSH_CONFIG_PREFIX) $(TOPDIR_PATH_SHA256SUM)) endif # CONFIG_KDEVOPS_SSH_CONFIG_UPDATE -- 2.51.0