On Wed, Aug 07, 2019 at 11:27:33AM +0200, Uwe Kleine-König wrote:
> 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 <[email protected]>
> ---
> 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
Hmm, I don't like this. The scripts works with python3 as well if
PTXCONF_PYTHON3_SYMLINK is enabled.
Maybe like this:
select PYTHON3 if NFSUTILS_PYTHON && !PYTHON && RUNTIME
select PYTHON3_SYMLINK if NFSUTILS_PYTHON && !PYTHON && RUNTIME
It's not a build-time dependency, and I think we should prefer Python3
here.
Michael
> 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
> [email protected]
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
