From: schumaker.anna@gmail.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 [thread overview]
Message-ID: <20211028183519.160772-10-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20211028183519.160772-1-Anna.Schumaker@Netapp.com>
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
And create a shell script that launches the python program from the
$(libdir)
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
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
next prev parent reply other threads:[~2021-10-28 18:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 18:35 [PATCH v5 0/9] Add a tool for using the new sysfs files schumaker.anna
2021-10-28 18:35 ` [PATCH v5 1/9] rpcctl: Add a rpcctl.py tool schumaker.anna
2021-10-28 18:35 ` [PATCH v5 2/9] rpcctl: Add a command for printing xprt switch information schumaker.anna
2021-10-28 18:35 ` [PATCH v5 3/9] rpcctl: Add a command for printing individual xprts schumaker.anna
2021-10-28 18:35 ` [PATCH v5 4/9] rpcctl: Add a command for printing rpc client information schumaker.anna
2021-10-28 18:35 ` [PATCH v5 5/9] rpcctl: Add a command for changing xprt dstaddr schumaker.anna
2021-10-28 18:35 ` [PATCH v5 6/9] rpcctl: Add a command for changing xprt switch dstaddrs schumaker.anna
2021-10-28 18:35 ` [PATCH v5 7/9] rpcctl: Add a command for changing xprt state schumaker.anna
2021-10-28 18:35 ` [PATCH v5 8/9] rpcctl: Add a man page schumaker.anna
2021-10-28 18:35 ` schumaker.anna [this message]
2021-11-08 17:15 ` [PATCH v5 9/9] rpcctl: Add installation to the Makefile Steve Dickson
2021-11-08 17:19 ` Steve Dickson
2021-11-08 18:15 ` Anna Schumaker
2021-11-01 14:40 ` [PATCH v5 0/9] Add a tool for using the new sysfs files Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211028183519.160772-10-Anna.Schumaker@Netapp.com \
--to=schumaker.anna@gmail.com \
--cc=Anna.Schumaker@Netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox