[PATCH v3 33/36] Makefile: Remove CONFIG_TOPDIR_PATH_HAS_SHA256SUM
Chuck Lever <[email protected]>
| Newsgroups | dev.linux.lists.kdevops |
|---|---|
| Message-ID | <[email protected]> |
From: Chuck Lever <[email protected]> Clean up: Sufficient time has passed that this compatibility setting is no longer necessary. Suggested-by: Luis Chamberlain <[email protected]> Reviewed-by: Luis Chamberlain <[email protected]> Signed-off-by: Chuck Lever <[email protected]> --- 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