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 046E3245023 for ; Thu, 4 Sep 2025 15:15: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=1756998946; cv=none; b=NEe37Amlw9Tj9FoiX4vx5UmtVEH0jaEDEOMCGCoLWGx8+BhwfY9Gox0t7OKdIFJxH1runckjXzMK3+IsUi7G4neiGrFEhRszbhdqW3BtVp051y4VdU1GCBIaAhlhT+eKRD6xDXIc12peFcMUvubHsVEWueLlSKEuxLJ3lziNo0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756998946; c=relaxed/simple; bh=TUcHMA3w5OST0Xh4/RwVUHYQ2YZ28IQH7Yllpn8aNvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X9z7M609DiyRIWPhYBAcWtnyocmm2EWimUM+gka3S4PWVDoQLwCdyxe6VaWBbVFHtyrHwMk+9nfFhq9hpCJGIuzeOlxugN8IdLIOAEiuUQ5Qr/JjoSk7nO+RvmNlVaryXHGXAEhAFpUq73qGAWOkf63zQdpT9CNb8Iwn+Npc6ck= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KeR/LoeN; 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="KeR/LoeN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9172AC4CEF6; Thu, 4 Sep 2025 15:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756998945; bh=TUcHMA3w5OST0Xh4/RwVUHYQ2YZ28IQH7Yllpn8aNvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KeR/LoeNULqSanzlVgXwjFK9jhObJc3JW1rFKLLRF9RQjgzi9YpkLqSuoH2wTBoYS hK4vXFjBnXKQCkXxwLEb9E+ONhdJBzk4XlBrHRCH64/cqZhFPa92HEPWx3Mso2mLt5 733Q1Xi+Sq2rGHCBsBdE+j2IbykOVp+NxQVPM71cxuu9dSa4uuoFrE1mpJVVddxEOt 43c55TkPv+Jksyxk4ei7I6I77dGdqfVM84pCwD2aHwTMV8ySyRhbX4ikEweCWz/cPe v+Z6QLOxwHS9Rwr1tqXyeP7HST5INgh8SSkNiMrdzicozT2ODDVYFpUoteaisNnNSa m8xbsBH/XJ2ZA== From: Chuck Lever To: Cc: Chuck Lever , Luis Chamberlain Subject: [PATCH v3 33/36] Makefile: Remove CONFIG_TOPDIR_PATH_HAS_SHA256SUM Date: Thu, 4 Sep 2025 11:15:21 -0400 Message-ID: <20250904151526.1596282-34-cel@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904151526.1596282-1-cel@kernel.org> References: <20250904151526.1596282-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 Clean up: Sufficient time has passed that this compatibility setting is no longer necessary. Suggested-by: Luis Chamberlain Reviewed-by: Luis Chamberlain Signed-off-by: Chuck Lever --- Kconfig | 5 ----- scripts/ssh.Makefile | 7 +------ scripts/update_ssh_config_guestfs.py | 11 +++-------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Kconfig b/Kconfig index 3f2bc8cf019a..54921617b8b2 100644 --- a/Kconfig +++ b/Kconfig @@ -10,11 +10,6 @@ config TOPDIR_PATH output yaml default $(shell, echo $TOPDIR_PATH) -config TOPDIR_PATH_HAS_SHA256SUM - bool - output yaml - default y - config TOPDIR_PATH_SHA256SUM string output yaml diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile index d18a03e094ee..68c6dcdd4dcd 100644 --- a/scripts/ssh.Makefile +++ b/scripts/ssh.Makefile @@ -10,12 +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)) -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=$(shell scripts/append-makefile-vars.sh $(CONFIG_KDEVOPS_SSH_CONFIG_PREFIX) $(SSH_CONFIG_SUFFIX)) +ANSIBLE_EXTRA_ARGS += kdevops_ssh_config=$(shell scripts/append-makefile-vars.sh $(CONFIG_KDEVOPS_SSH_CONFIG_PREFIX) $(CONFIG_TOPDIR_PATH_SHA256SUM)) endif # CONFIG_KDEVOPS_SSH_CONFIG_UPDATE diff --git a/scripts/update_ssh_config_guestfs.py b/scripts/update_ssh_config_guestfs.py index 8b212a9c15a2..143ff4fc24c4 100755 --- a/scripts/update_ssh_config_guestfs.py +++ b/scripts/update_ssh_config_guestfs.py @@ -85,14 +85,9 @@ def main(): with open(f'{topdir}/{extra_vars["kdevops_nodes"]}') as stream: nodes = yaml.safe_load(stream) - if extra_vars.get("topdir_path_has_sha256sum", False): - ssh_config = ( - f'{Path.home()}/.ssh/config_kdevops_{extra_vars["topdir_path_sha256sum"]}' - ) - else: - ssh_config = ( - f'{Path.home()}/.ssh/config_kdevops_{extra_vars["kdevops_host_prefix"]}' - ) + ssh_config = ( + f'{Path.home()}/.ssh/config_kdevops_{extra_vars["topdir_path_sha256sum"]}' + ) # make a stanza for each node sshconf = open(ssh_config, "w") -- 2.51.0