From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Sep 2022 16:30:06 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1odY4c-00HPaq-FT for lore@lore.pengutronix.de; Wed, 28 Sep 2022 16:30:06 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1odY4b-0001u1-Kv; Wed, 28 Sep 2022 16:30:05 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1odY3b-00005z-6h; Wed, 28 Sep 2022 16:29:03 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1odY3c-003R4o-0i; Wed, 28 Sep 2022 16:29:02 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1odY3Z-00EwSt-UL; Wed, 28 Sep 2022 16:29:02 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 28 Sep 2022 16:29:01 +0200 Message-Id: <20220928142901.3561227-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] psmisc: more finegrained tool instalation control X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ladislav Michl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 0dabc5a09715b7ec1e77544e620d0499e27c6254. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:29:01 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > 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 ") > @$(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) >