2021-10-22 20:56:33

by Anna Schumaker

[permalink] [raw]
Subject: [PATCH v4 9/9] rpcsys: Add installation to the Makefile

From: Anna Schumaker <[email protected]>

And create a shell script that launches the python program from the
$(libdir)

Signed-off-by: Anna Schumaker <[email protected]>
---
configure.ac | 1 +
tools/Makefile.am | 2 +-
tools/rpcsys/Makefile.am | 20 ++++++++++++++++++++
tools/rpcsys/rpcsys | 5 +++++
4 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 tools/rpcsys/Makefile.am
create mode 100644 tools/rpcsys/rpcsys

diff --git a/configure.ac b/configure.ac
index bc2d0f02979c..4df87a22166a 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/rpcsys/Makefile
tools/nfsdclnts/Makefile
tools/nfsconf/Makefile
tools/nfsdclddb/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9b4b0803db39..29e5249a2158 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 rpcsys nfsdclnts $(OPTDIRS)

MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/rpcsys/Makefile.am b/tools/rpcsys/Makefile.am
new file mode 100644
index 000000000000..9e29977c3d11
--- /dev/null
+++ b/tools/rpcsys/Makefile.am
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+PYTHON_FILES = rpcsys.py client.py switch.py sysfs.py xprt.py
+tooldir = $(DESTDIR)$(libdir)/rpcsys
+
+man8_MANS = rpcsys.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)/rpcsys.py
+ $(INSTALL) -m 755 rpcsys $(DESTDIR)$(sbindir)/rpcsys
+ sed -i "s|LIBDIR=.|LIBDIR=$(tooldir)|" $(DESTDIR)$(sbindir)/rpcsys
+
+
+
+MAINTAINERCLEANFILES=Makefile.in
diff --git a/tools/rpcsys/rpcsys b/tools/rpcsys/rpcsys
new file mode 100644
index 000000000000..a3f860081a26
--- /dev/null
+++ b/tools/rpcsys/rpcsys
@@ -0,0 +1,5 @@
+#!/bin/bash
+LIBDIR=.
+PYTHON3=/usr/bin/python
+
+exec $PYTHON3 $LIBDIR/rpcsys.py $*
--
2.33.1