mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH] vim: prevent file name conflicts with busybox
Date: Tue,  4 Apr 2023 23:04:35 +0200	[thread overview]
Message-ID: <20230404210435.3363032-1-rhi@pengutronix.de> (raw)

Busybox can install both xxd and vi, which will conflict with the files
installed by the vim package. If both busybox tools are selected, don't
make the vim menu selectable at all, otherwise make only the tools
selectable that are not installed by busybox.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/vim.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rules/vim.in b/rules/vim.in
index f09b93b47cfd..c4c9d14e6833 100644
--- a/rules/vim.in
+++ b/rules/vim.in
@@ -1,7 +1,11 @@
 ## SECTION=editors
 
+comment "BusyBox' vi and xxd is selected!"
+	depends on BUSYBOX_VI && BUSYBOX_XXD
+
 menuconfig VIM
 	tristate
+	depends on !(BUSYBOX_VI && BUSYBOX_XXD)
 	select LIBC_DL
 	select LIBC_M
 	select GCCLIBS_GCC_S
@@ -14,10 +18,18 @@ menuconfig VIM
 
 if VIM
 
+comment "BusyBox' vi is selected!"
+	depends on BUSYBOX_VI
+
 config VIM_VIM
+	depends on !BUSYBOX_VI
 	bool "Vim Editor"
 
+comment "BusyBox' xxd is selected!"
+	depends on BUSYBOX_XXD
+
 config VIM_XXD
+	depends on !BUSYBOX_XXD
 	bool "XXD"
 
 endif
-- 
2.39.2




             reply	other threads:[~2023-04-04 21:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-04 21:04 Roland Hieber [this message]
2023-04-12  6:29 ` [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=20230404210435.3363032-1-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --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