[ptxdist] [PATCH] vim: prevent file name conflicts with busybox

[ptxdist] [PATCH] vim: prevent file name conflicts with busybox

[Roland Hieber]

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

Re: [ptxdist] [APPLIED] vim: prevent file name conflicts with busybox

[Michael Olbrich]

Thanks, applied as ad2eb34a07ed0ba8868bcf2341555ed59e02ea4a.

Michael

[sent from post-receive hook]

On Wed, 12 Apr 2023 08:29:52 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> 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>
> Message-Id: <20230404210435.3363032-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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