public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: schumaker.anna@gmail.com
To: steved@redhat.com, linux-nfs@vger.kernel.org
Cc: Anna.Schumaker@Netapp.com
Subject: [PATCH v2 9/9] nfs-sysfs: Add installation to the Makefile
Date: Fri,  6 Aug 2021 16:17:39 -0400	[thread overview]
Message-ID: <20210806201739.472806-10-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20210806201739.472806-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/nfs-sysfs/Makefile.am | 20 ++++++++++++++++++++
 tools/nfs-sysfs/nfs-sysfs   |  5 +++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tools/nfs-sysfs/Makefile.am
 create mode 100644 tools/nfs-sysfs/nfs-sysfs

diff --git a/configure.ac b/configure.ac
index bc2d0f02979c..092e230551f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -731,6 +731,7 @@ AC_CONFIG_FILES([
 	tools/rpcgen/Makefile
 	tools/mountstats/Makefile
 	tools/nfs-iostat/Makefile
+	tools/nfs-sysfs/Makefile
 	tools/nfsdclnts/Makefile
 	tools/nfsconf/Makefile
 	tools/nfsdclddb/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9b4b0803db39..1c89d66be744 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 nfs-sysfs nfsdclnts $(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/nfs-sysfs/Makefile.am b/tools/nfs-sysfs/Makefile.am
new file mode 100644
index 000000000000..bdfc7454a7a1
--- /dev/null
+++ b/tools/nfs-sysfs/Makefile.am
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+PYTHON_FILES =  nfs-sysfs.py client.py switch.py sysfs.py xprt.py
+tooldir = $(DESTDIR)$(libdir)/nfs-sysfs
+
+man8_MANS = nfs-sysfs.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)/nfs-sysfs.py
+	$(INSTALL) -m 755 nfs-sysfs $(DESTDIR)$(sbindir)/nfs-sysfs
+	sed -i "s|LIBDIR=.|LIBDIR=$(tooldir)|" $(DESTDIR)$(sbindir)/nfs-sysfs
+
+
+
+MAINTAINERCLEANFILES=Makefile.in
diff --git a/tools/nfs-sysfs/nfs-sysfs b/tools/nfs-sysfs/nfs-sysfs
new file mode 100644
index 000000000000..f7ce621eff57
--- /dev/null
+++ b/tools/nfs-sysfs/nfs-sysfs
@@ -0,0 +1,5 @@
+#!/bin/bash
+LIBDIR=.
+PYTHON3=/usr/bin/python
+
+exec $PYTHON3 $LIBDIR/nfs-sysfs.py $*
-- 
2.32.0


  parent reply	other threads:[~2021-08-06 20:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-06 20:17 [PATCH v2 0/9] Add a tool for using the new sysfs files schumaker.anna
2021-08-06 20:17 ` [PATCH v2 1/9] nfs-sysfs: Add an nfs-sysfs.py tool schumaker.anna
2021-08-17 16:57   ` Mora, Jorge
2021-08-23 21:41     ` Anna Schumaker
2021-08-06 20:17 ` [PATCH v2 2/9] nfs-sysfs.py: Add a command for printing xprt switch information schumaker.anna
2021-08-06 20:17 ` [PATCH v2 3/9] nfs-sysfs.py: Add a command for printing individual xprts schumaker.anna
2021-08-06 20:17 ` [PATCH v2 4/9] nfs-sysfs.py: Add a command for printing rpc-client information schumaker.anna
2021-08-06 20:17 ` [PATCH v2 5/9] nfs-sysfs.py: Add a command for changing xprt dstaddr schumaker.anna
2021-08-06 20:17 ` [PATCH v2 6/9] nfs-sysfs.py: Add a command for changing xprt-switch dstaddrs schumaker.anna
2021-08-06 20:17 ` [PATCH v2 7/9] nfs-sysfs.py: Add a command for changing xprt state schumaker.anna
2021-08-17 17:00   ` Mora, Jorge
2021-08-06 20:17 ` [PATCH v2 8/9] nfs-sysfs: Add a man page schumaker.anna
2021-08-06 20:17 ` schumaker.anna [this message]
2021-08-08 16:30 ` [PATCH v2 0/9] Add a tool for using the new sysfs files Steve Dickson
2021-08-08 19:00   ` Anna Schumaker

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=20210806201739.472806-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