From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Ladislav Michl <oss-lists@triops.cz>
Subject: Re: [ptxdist] [APPLIED] psmisc: more finegrained tool instalation control
Date: Wed, 28 Sep 2022 16:29:01 +0200 [thread overview]
Message-ID: <20220928142901.3561227-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <YyHu/412LT8uQTy1@lenoch>
Thanks, applied as 0dabc5a09715b7ec1e77544e620d0499e27c6254.
Michael
[sent from post-receive hook]
On Wed, 28 Sep 2022 16:29:01 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <YyHu/412LT8uQTy1@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/psmisc.in b/rules/psmisc.in
> index 1c3a6141425c..3d3c7a802823 100644
> --- a/rules/psmisc.in
> +++ b/rules/psmisc.in
> @@ -1,18 +1,48 @@
> ## SECTION=shell_and_console
>
> -config PSMISC
> +menuconfig PSMISC
> tristate
> - depends on ( !BUSYBOX_FUSER && !BUSYBOX_KILLALL && !BUSYBOX_PSTREE ) || ALLYES
> select NCURSES
> - prompt "psmisc"
> + prompt "psmisc "
> help
> utilities that use the proc file system
>
> -comment "BusyBox' fuser is selected! (psmisc)"
> +if PSMISC
> +
> +config PSMISC_FUSER
> + bool
> + prompt "fuser"
> + depends on !BUSYBOX_FUSER || ALLYES
> +
> +comment "BusyBox' fuser is selected!"
> depends on BUSYBOX_FUSER
>
> -comment "BusyBox' killall is selected! (psmisc)"
> +config PSMISC_KILLALL
> + bool
> + prompt "killall"
> + depends on !BUSYBOX_KILLALL || ALLYES
> +
> +comment "BusyBox' killall is selected!"
> depends on BUSYBOX_KILLALL
>
> -comment "BusyBox' pstree is selected! (psmisc)"
> +config PSMISC_PEEKFD
> + bool
> + prompt "peekfd"
> +
> +config PSMISC_PRTSTAT
> + bool
> + prompt "prtstat"
> +
> +config PSMISC_PSLOG
> + bool
> + prompt "pslog"
> +
> +config PSMISC_PSTREE
> + bool
> + prompt "pstree"
> + depends on !BUSYBOX_PSTREE || ALLYES
> +
> +comment "BusyBox' pstree is selected!"
> depends on BUSYBOX_PSTREE
> +
> +endif
> diff --git a/rules/psmisc.make b/rules/psmisc.make
> index 66541c615b22..fdb4798770f7 100644
> --- a/rules/psmisc.make
> +++ b/rules/psmisc.make
> @@ -44,6 +44,16 @@ PSMISC_CONF_OPT := \
> # Target-Install
> # ----------------------------------------------------------------------------
>
> +PSMISC_BIN-y :=
> +PSMISC_BIN-$(PTXCONF_PSMISC_FUSER) += fuser
> +PSMISC_BIN-$(PTXCONF_PSMISC_KILLALL) += killall
> +ifndef PTXCONF_ARCH_ARM64
> +PSMISC_BIN-$(PTXCONF_PSMISC_PEEKFD) += peekfd
> +endif
> +PSMISC_BIN-$(PTXCONF_PSMISC_PRTSTAT) += prtstat
> +PSMISC_BIN-$(PTXCONF_PSMISC_PSLOG) += pslog
> +PSMISC_BIN-$(PTXCONF_PSMISC_PSTREE) += pstree
> +
> $(STATEDIR)/psmisc.targetinstall:
> @$(call targetinfo)
>
> @@ -53,13 +63,9 @@ $(STATEDIR)/psmisc.targetinstall:
> @$(call install_fixup, psmisc,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
> @$(call install_fixup, psmisc,DESCRIPTION,missing)
>
> - @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/fuser)
> - @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/killall)
> -ifndef PTXCONF_ARCH_ARM64
> - @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/peekfd)
> -endif
> - @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/prtstat)
> - @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/pstree)
> + @$(foreach tool, $(PSMISC_BIN-y), \
> + $(call install_copy, psmisc, 0, 0, 0755, -, \
> + /usr/bin/$(tool));)
>
> @$(call install_finish, psmisc)
>
prev parent reply other threads:[~2022-09-28 14:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 15:10 [ptxdist] [PATCH 2/2] " Ladislav Michl
2022-09-28 14:29 ` Michael Olbrich [this message]
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=20220928142901.3561227-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=oss-lists@triops.cz \
--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