mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] nfsutils: don't install nfsiostat without ensuring python is available
Date: Wed,  7 Aug 2019 11:27:33 +0200	[thread overview]
Message-ID: <20190807092733.26364-1-u.kleine-koenig@pengutronix.de> (raw)

nfsiostat is a python script. Introduce a new suboption to select
PYTHON and don't install nfsiostat if this is disabled.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/nfsutils.in   | 7 +++++++
 rules/nfsutils.make | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index ef7eb7b98d60..34d237737024 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -9,6 +9,7 @@ menuconfig NFSUTILS
 	select RPCBIND			if RUNTIME
 	select LIBTIRPC			if GLOBAL_IPV6
 	select ROOTFS_PROTOCOLS		if NFSUTILS_CLIENT
+	select PYTHON			if NFSUTILS_PYTHON
 	select ROOTFS_VAR_LIB		if RUNTIME
 	help
 	  The Sun Network Filesystem (NFS) protocol provides transparent remote
@@ -32,6 +33,12 @@ config NFSUTILS_SERVER
 	help
 	  Install all tools and daemons to run an NFS server.
 
+config NFSUTILS_PYTHON
+	bool
+	prompt "install python utilities"
+	help
+	  Install tools depending on Python. Currently this affects nfsiostat only
+
 config NFSUTILS_NFSD_STARTSCRIPT
 	bool
 	depends on NFSUTILS_SERVER
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 5986d51fd716..ff1f4cae0560 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -77,7 +77,6 @@ $(STATEDIR)/nfsutils.targetinstall:
 	@$(call install_fixup, nfsutils,DESCRIPTION,"Network Filesystem Support")
 
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsstat)
-	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat)
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/showmount)
 
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.statd)
@@ -119,6 +118,10 @@ ifdef PTXCONF_NFSUTILS_SERVER
 		/etc/exports)
 endif
 
+ifdef PTXCONF_NFSUTILS_PYTHON
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat)
+endif
+
 #	#
 #	# busybox init: start scripts
 #	#
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2019-08-07  9:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-07  9:27 Uwe Kleine-König [this message]
2019-08-07 11:45 ` Michael Olbrich
2019-08-08  7:59   ` [ptxdist] [PATCH v2] " Uwe Kleine-König

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=20190807092733.26364-1-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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