From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 31 May 2024 08:09:04 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sCvRo-000Eon-15 for lore@lore.pengutronix.de; Fri, 31 May 2024 08:09:04 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sCvRn-0005zS-7t; Fri, 31 May 2024 08:09:03 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sCvRF-0005SK-LI; Fri, 31 May 2024 08:08:29 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sCvRF-003h43-85; Fri, 31 May 2024 08:08:29 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sCvRF-00F6GL-0f; Fri, 31 May 2024 08:08:29 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 31 May 2024 08:08:29 +0200 Message-Id: <20240531060829.3598986-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240513132247.25521-2-abbotti@mev.co.uk> References: <20240513132247.25521-2-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] dash: install /usr/bin/sh symlink by default if not provided by BusyBox 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: Ian Abbott 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as e320da8efe25e2a8b1dcc88cf7944f3a4b817d8e. Michael [sent from post-receive hook] On Fri, 31 May 2024 08:08:29 +0200, Ian Abbott wrote: > Only allow DASH_LINK_SH to be enabled if the /usr/bin/sh symbolic link > is not being installed by BusyBox (unless overridden by ALLYES). > Default to enabled if the link is not being installed by BusyBox. > > Signed-off-by: Ian Abbott > Message-Id: <20240513132247.25521-2-abbotti@mev.co.uk> > [mol: simplify 'default'] > Signed-off-by: Michael Olbrich > > diff --git a/rules/dash.in b/rules/dash.in > index 88ea87942f6e..16b57b78a5bd 100644 > --- a/rules/dash.in > +++ b/rules/dash.in > @@ -11,8 +11,13 @@ menuconfig DASH > > if DASH > > +comment "BusyBox sh is selected" > + depends on BUSYBOX && !BUSYBOX_SH_IS_NONE > + > config DASH_LINK_SH > bool > + depends on !BUSYBOX || BUSYBOX_SH_IS_NONE || ALLYES > + default y > prompt "link to /bin/sh" > help > Create a link "/bin/sh" that points to "/bin/dash". Select