mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ian Abbott <abbotti@mev.co.uk>
To: ptxdist@pengutronix.de
Cc: Ian Abbott <abbotti@mev.co.uk>
Subject: [ptxdist] [PATCH 1/2] dash: install /usr/bin/sh symlink by default if not provided by BusyBox
Date: Mon, 13 May 2024 13:55:05 +0100	[thread overview]
Message-ID: <20240513132247.25521-2-abbotti@mev.co.uk> (raw)
In-Reply-To: <20240513132247.25521-1-abbotti@mev.co.uk>

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 <abbotti@mev.co.uk>
---
 rules/dash.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rules/dash.in b/rules/dash.in
index 88ea87942..b9579c308 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 !BUSYBOX || BUSYBOX_SH_IS_NONE
 	prompt "link to /bin/sh"
 	help
 	  Create a link "/bin/sh" that points to "/bin/dash". Select
-- 
2.43.0




  reply	other threads:[~2024-05-13 13:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13 12:55 [ptxdist] [PATCH 0/2] Change selection of /usr/bin/sh symlink Ian Abbott
2024-05-13 12:55 ` Ian Abbott [this message]
2024-05-31  6:08   ` [ptxdist] [APPLIED] dash: install /usr/bin/sh symlink by default if not provided by BusyBox Michael Olbrich
2024-05-13 12:55 ` [ptxdist] [PATCH 2/2] bash: allow installation of /usr/bin/sh symlink to be chosen manually Ian Abbott
2024-05-31  6:08   ` [ptxdist] [APPLIED] " Michael Olbrich

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=20240513132247.25521-2-abbotti@mev.co.uk \
    --to=abbotti@mev.co.uk \
    --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