From patchwork Wed Feb 12 14:14:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13971506 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 D4D15219ED for ; Wed, 12 Feb 2025 14:14:55 +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=1739369695; cv=none; b=FwH5A97Eb7a1/oaON9kNRvasuuRIbIiJq1CkjQgt/FWAOeKqv9AIlrPqZyhHftgY2YWbBJcQfLVGapQw6uVTZJQN3nJlABJhMs2KJogA10Fl6xj1zx68FKcSernndcIUM+lY8KrYT22yviir6K3Wai3Foer4xRAiEJztClN4ztA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739369695; c=relaxed/simple; bh=gj9zUY3WMC+eg7ebLdqhuUkgiG2Xe5rSnUcL2RDPFp8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=L7OgcadOBpm/9mmxQHdXV4DOxxhsoaHGfXjBfzSj+3DKvGIIcFoUh5ssHiziHc+DadI/SfisPmMdPPdb551isC/XezLNiXQkPV45qSfB0haBW3RAJGrg7uflU27p/SJeoUouIGnQQ4cXFEI9LYTmSgHdLr3OVR+5SxW9AhugjaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BbvF0Oq3; 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="BbvF0Oq3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0AFEC4CEDF; Wed, 12 Feb 2025 14:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739369695; bh=gj9zUY3WMC+eg7ebLdqhuUkgiG2Xe5rSnUcL2RDPFp8=; h=From:Date:Subject:To:Cc:From; b=BbvF0Oq3ixTThXJGh8jFRwuYGh0IPrS2d/udYZD0PqkKbnZezGtr6l/D7muW0svUL YaLpp15ClytZZyfH4JUMG4iJV7bTiaA2pmMGOZkb/ZzXkWy9oaVuX1j8HzCsmYGjWL Z0orcIowshQS5aW1neDFbQMfbkkIz08zx6wCvRgFko1OZzw296321A6NMlddl3oHJn dWKXoBS8iXn3O5FqknGBLgCV6MaqfXwRuTPyn6sNgUHyPoVk1YkaM9hpK20Jg+5pbx 3hnk+ClbDZpOCOAcNdFE9MgOvXO9zv6BtH4uYJfbCoMr8YxAAKuZ6oZAUnWHlJfL3+ dq7yjA1USd5cg== From: Jeff Layton Date: Wed, 12 Feb 2025 09:14:41 -0500 Subject: [PATCH kdevops] pynfs: install packaged xdrlib3 module on Debian-derived distros Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250212-main-v1-1-6bc84cef5e32@kernel.org> X-B4-Tracking: v=1; b=H4sIANCsrGcC/x3MQQqAIBBA0avIrBNUqKCrRAtzphoiFQUJxLsnL R98foVMiSnDIiokKpw5+A49CHCX9SdJxm4wyozKaCMfy16i1dNO6GhGBz2NiQ5+/80KN1IJMcP W2gdyxbdfXwAAAA== X-Change-ID: 20250212-main-da16bedce7dc To: kdevops@lists.linux.dev Cc: Daniel Gomez , Chuck Lever , Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2890; i=jlayton@kernel.org; h=from:subject:message-id; bh=gj9zUY3WMC+eg7ebLdqhuUkgiG2Xe5rSnUcL2RDPFp8=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBnrKza6PBG0fyUuVhHCiUmsiyH8iFzNx6nmvVwF beqhUWx7kmJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ6ys2gAKCRAADmhBGVaC FWaPD/0WNZ7VkGCuiTZql7WyGOorkEELUasy2qpLCKtGMmc/LkvdFKUDC3Uf8wvL+QPRgtLp5pH GMrHo7xMVOeE35V0DYNFbeqPnu7X+ZRwUdhyTiEB2vnnTBOiFbdzkk74BgV0U/gyekxgpAY5YuJ jgEqC9drE20T9o+4arcmtnC5hLEIOwywhrCRun0ofIdHj5YlPpukRqPO14kSClU2Rr7IYcZ+NCA uMQbAXBMFsT8TwQhXi4HB+xMQB5HCup7vLo7iZU4ilUx0MtF6DdRot11V4TVx7pm8NO9odb1Ed7 OFaefH8c6wEMmfdx0SuzTTnhS2hBO/3YEVu82UdwGpgoAdfdlvgPyawVK4SIOl/I0ONPnkVZ4sc tI2FzOyuMCTUwYJycLD4JPPNE4IIxoe6H3raaPzg1HyUQ0ZtHLbe6xB7triWpSfOlnk3rAV7bPA 27iJ8T2ldct0UJK/MJ+96WAqTRyn0EIrajlzODluuxYohgNb+exODExlgYBsyAg7u9uqyjNgq2y 6tdCd4ANxYuw6DVBcqtsxKUZyvzHtfUqWJUC7IUXLTx1V1ATxI22J27tjoTfYWnjJCwhLFQ/7bx vi8idjsRkpDdx6R/20s7V9hyqvoWUU5A/Zg8VV+Z8Gf1fdubh8KpdhOaKfOAttOL48F6rpc4DUa DUspV4+WvqV9X4g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Daniel Gomez reported that Debian distros have this module packaged and that it should be preferred over a pip install. Move the install to install-deps and change Debian distros to use the packaged module instead. Fedora and SuSE distros still use pip. Signed-off-by: Jeff Layton Reviewed-by: Chuck Lever Reviewed-by: Daniel Gomez --- playbooks/roles/pynfs/tasks/install-deps/debian/main.yml | 1 + playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 4 ++++ playbooks/roles/pynfs/tasks/install-deps/suse/main.yml | 4 ++++ playbooks/roles/pynfs/tasks/main.yml | 5 ----- 4 files changed, 9 insertions(+), 5 deletions(-) --- base-commit: ccf731c4cf1f964e7e8a5fc2a8779ff10d306d64 change-id: 20250212-main-da16bedce7dc Best regards, diff --git a/playbooks/roles/pynfs/tasks/install-deps/debian/main.yml b/playbooks/roles/pynfs/tasks/install-deps/debian/main.yml index 812de1d5f8b105d8d4987451e56d115166a138d2..e4c3c30e7bdb01d4864d541f28f3358f981af934 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/debian/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/debian/main.yml @@ -12,6 +12,7 @@ - swig - python3-gssapi - python3-ply + - python3-standard-xdr-lib state: present update_cache: yes tags: [ 'pynfs', 'deps' ] diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml index 93513c42626350e0096e8a9db90b6d6f180e7e5f..8aa2ba1288092945c6d3e57a63e44dacc0d0ef87 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml @@ -23,3 +23,7 @@ - swig - python3-gssapi - python3-ply + +- name: Install xdrlib3 + ansible.builtin.pip: + name: xdrlib3 diff --git a/playbooks/roles/pynfs/tasks/install-deps/suse/main.yml b/playbooks/roles/pynfs/tasks/install-deps/suse/main.yml index 657dd7e0e170f86ec4fa2c47c1c7f29297317951..8321c064f9b00a4db9fdef35877ff180fad0b229 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/suse/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/suse/main.yml @@ -13,3 +13,7 @@ - python3-gssapi - python3-ply state: present + +- name: Install xdrlib3 + ansible.builtin.pip: + name: xdrlib3 diff --git a/playbooks/roles/pynfs/tasks/main.yml b/playbooks/roles/pynfs/tasks/main.yml index d3b8832409b17fbc03a2a3e625e0d319a45af919..c6add8e47fec298e2c7351805a42307ee8398e3c 100644 --- a/playbooks/roles/pynfs/tasks/main.yml +++ b/playbooks/roles/pynfs/tasks/main.yml @@ -70,11 +70,6 @@ when: - not kdevops_workflows_dedicated_workflow|bool -- name: Install xdrlib3 - tags: [ 'pynfs' ] - ansible.builtin.pip: - name: xdrlib3 - - name: Build pynfs tags: [ 'pynfs' ] command: ./setup.py build