Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1871303pxb; Thu, 28 Oct 2021 11:36:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXCvrNgytwm4MjUEFcPJOSH63KEtNsvfL682my7nmx2h/KiQAHV1PuCeKun0nMR4pc8JmI X-Received: by 2002:a17:906:5d16:: with SMTP id g22mr7261639ejt.52.1635446167539; Thu, 28 Oct 2021 11:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635446167; cv=none; d=google.com; s=arc-20160816; b=tDjfOIDuHNaNaQLmmdSwJwlc166sbVQdPZhAcMz2yctfyxjLrlhXAxu/yf0O5etpnf LQUKJ1CIFBvofwBEB3S9RN9j7RPTXsYVlCGFeC1yLyNE3d6XxmgEAhekoo26jsOVSS8j 0SV5sqSAV0khwJKF5kchmAll57H4JoF8TTUexUgZemXIqWmDRkpQ3CYlzAbpVjkriGmv RawXiQi2KnVayVuLfv1X81Wume5OqLNmmN4IEQdFdiKGGlA8aHUhkAbTcdEFzNBBGsNT Kbf2RBZendYTTw3cj1W/tBccHbm8X4aKgtMLz4CD2f6dbC0ymbOvkNN4pyoClLh3zGkZ PYOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=0p3tzqQxt2fr7aUhoLp6NI6pwaVwRH7jkeCkX9uX9DA=; b=cV2TMMXaEMGltci0PaKwvCw6DOiboK7DRpOZlFeRZA28I9hkjv97K8zGVWc7aZAHaH /lx3MJzH/wAjFFzxkZ5blyifkcQqT1qnvXwYLTdiOCTGHzuC/A7wUrh0xhhKNn9GAUkw YqTWMB5QfxR24/7LcZJx4XoevognEEHp64J27Z1kyA4qGv4/RHmNncYemnIOxrvBGhnC mfthHj7YluGVpkZ8L02o9VGInqVHDigmrSTdFRYKD+PEHLUyI0qV28MoKYyXpvwBmnGU aV7cGL5A+V7QK0VUMR/Bhn+DNiEiA08Ik1TBxO/iGr8eiTmp9w3Sx59mEWQZW73oa+dM jsaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WQsJM2ka; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 5si4946477eji.628.2021.10.28.11.35.41; Thu, 28 Oct 2021 11:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WQsJM2ka; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231201AbhJ1SiA (ORCPT + 99 others); Thu, 28 Oct 2021 14:38:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231208AbhJ1Sh6 (ORCPT ); Thu, 28 Oct 2021 14:37:58 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35059C061570 for ; Thu, 28 Oct 2021 11:35:31 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id bj31so6809797qkb.2 for ; Thu, 28 Oct 2021 11:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0p3tzqQxt2fr7aUhoLp6NI6pwaVwRH7jkeCkX9uX9DA=; b=WQsJM2ka8QEdRyKJYgz+p3ymmycPTo+oAFCOqpYeXP7oNskIYh3/8TptkMM8EGd4B7 HbbF9GwjHZ3GYNlVwCmnxSbKkwRpWQi+BFIKpq5xtJtfxnFz4c+EBJO946GLJHgRZouV XfYQMIFLb3G4wTtwW9vlLfRPTM7AGre4xvxpExxoqDSV4N1Z+cx60qEFEp2I1jIfxzgC Y67slyJ/Xh33gYYMPBRNo0P9WlOxRZeqOWiiC4QquaDt3hpxhoZmVUkYjNWmQlSu0L0G KbLNcBgE0I9ay/N1mdpqWJspB/e6UgvL/y6QY8Iwan7UV39MwDSKGXY8unomAT4u7q0W wWIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0p3tzqQxt2fr7aUhoLp6NI6pwaVwRH7jkeCkX9uX9DA=; b=xwbVNPSsBodLPpLfDGUJ2zvh0bqhXOo9elZ9iiL0eY/kSgyZDJZvB8xgx9uFLOHfQv 9Zc6ZUrkSiTdpwUTt9ogWbvkX4qiJHB7Zr1dy23CK4jle7GMZzwSe/5x1c/T48dVSTS9 B6YWwaq+iW921ll0mpX1pbN84Hr0wlamrmdWJewEPItx5e6FcLwplwJheB6/W9pH+kFt AiUdTgkw5dESgeo4cL0PTxDxPOOKjNm9wxbAcZNLaOvH3ZbrZKlPj2yqwCY1F9inl0V3 eZYPHTmG9RQZ0YGB2et3EuenrfDa5n1t99OXdoEg6aJdJSPp59W7jgV3B0KViHcd4w8v UQpQ== X-Gm-Message-State: AOAM533koLGf/JyHRyiDQxK3nWYwAdoQB+uX8eHq2T/4x6ksSNeCQHYy 1HGOLA7VM++nw7sES1tjgTZ7UCMI9BA= X-Received: by 2002:a05:620a:bc1:: with SMTP id s1mr5187073qki.49.1635446129852; Thu, 28 Oct 2021 11:35:29 -0700 (PDT) Received: from gouda.nowheycreamery.com ([2601:401:100:a3a:aa6d:aaff:fe2e:8a6a]) by smtp.gmail.com with ESMTPSA id q13sm2556476qkl.7.2021.10.28.11.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 11:35:29 -0700 (PDT) Sender: Anna Schumaker From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: steved@redhat.com, linux-nfs@vger.kernel.org Cc: Anna.Schumaker@Netapp.com Subject: [PATCH v5 9/9] rpcctl: Add installation to the Makefile Date: Thu, 28 Oct 2021 14:35:19 -0400 Message-Id: <20211028183519.160772-10-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211028183519.160772-1-Anna.Schumaker@Netapp.com> References: <20211028183519.160772-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker And create a shell script that launches the python program from the $(libdir) Signed-off-by: Anna Schumaker --- configure.ac | 1 + tools/Makefile.am | 2 +- tools/rpcctl/Makefile.am | 20 ++++++++++++++++++++ tools/rpcctl/rpcctl | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tools/rpcctl/Makefile.am create mode 100644 tools/rpcctl/rpcctl diff --git a/configure.ac b/configure.ac index 93626d62be40..dcd3be0c8a8b 100644 --- a/configure.ac +++ b/configure.ac @@ -737,6 +737,7 @@ AC_CONFIG_FILES([ tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile + tools/rpcctl/Makefile tools/nfsdclnts/Makefile tools/nfsconf/Makefile tools/nfsdclddb/Makefile diff --git a/tools/Makefile.am b/tools/Makefile.am index 9b4b0803db39..c3feabbec681 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -12,6 +12,6 @@ if CONFIG_NFSDCLD OPTDIRS += nfsdclddb endif -SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat nfsdclnts $(OPTDIRS) +SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) MAINTAINERCLEANFILES = Makefile.in diff --git a/tools/rpcctl/Makefile.am b/tools/rpcctl/Makefile.am new file mode 100644 index 000000000000..f4237dbc89e5 --- /dev/null +++ b/tools/rpcctl/Makefile.am @@ -0,0 +1,20 @@ +## Process this file with automake to produce Makefile.in +PYTHON_FILES = rpcctl.py client.py switch.py sysfs.py xprt.py +tooldir = $(DESTDIR)$(libdir)/rpcctl + +man8_MANS = rpcctl.man + +all-local: $(PYTHON_FILES) + +install-data-hook: + mkdir -p $(tooldir) + for f in $(PYTHON_FILES) ; do \ + $(INSTALL) -m 644 $$f $(tooldir)/$$f ; \ + done + chmod +x $(tooldir)/rpcctl.py + $(INSTALL) -m 755 rpcctl $(DESTDIR)$(sbindir)/rpcctl + sed -i "s|LIBDIR=.|LIBDIR=$(tooldir)|" $(DESTDIR)$(sbindir)/rpcctl + + + +MAINTAINERCLEANFILES=Makefile.in diff --git a/tools/rpcctl/rpcctl b/tools/rpcctl/rpcctl new file mode 100644 index 000000000000..4cc35e1ea3f9 --- /dev/null +++ b/tools/rpcctl/rpcctl @@ -0,0 +1,5 @@ +#!/bin/bash +LIBDIR=. +PYTHON3=/usr/bin/python + +exec $PYTHON3 $LIBDIR/rpcctl.py $* -- 2.33.1