Thanks, applied as e859fea01e033f691efac8124902478f8496233c. Michael
[sent from post-receive hook] On Sun, 12 May 2024 15:16:40 +0200, Ian Abbott <[email protected]> wrote: > Commit ad2eb34a07ed ("vim: prevent file name conflicts with busybox") > prevented vim being selected if busybox vi is selected. However, the vim > package does not currently install /usr/bin/vi, so the only conflict is > between vim's xxd and busybox's xxd. > > Allow vim to be installed alongside busybox vi. Also add a configuration > option to allow installation of a /usr/bin/vi symbolic link to > /usr/bin/vim, but only allow it to be selected if busybox vi is not > selected. > > Make the auto-selection of LIBC_M depend on VIM_VIM because VIM_XXD does > not appear to require it. While we are at it, remove the obsolete > GCCLIBS_GCC_S and LIBC_DL selections. > > Signed-off-by: Ian Abbott <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/vim.in b/rules/vim.in > index c4c9d14e6833..d16b54a2deb1 100644 > --- a/rules/vim.in > +++ b/rules/vim.in > @@ -1,14 +1,8 @@ > ## 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 > + select LIBC_M if VIM_VIM > select NCURSES > prompt "vim " > help > @@ -18,18 +12,22 @@ 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' vi is selected!" > + depends on VIM_VIM && BUSYBOX_VI > + > +config VIM_VI_SYMLINK > + depends on VIM_VIM && !BUSYBOX_VI || ALLYES > + bool "install symbolic link /usr/bin/vi" > + default y > + > comment "BusyBox' xxd is selected!" > depends on BUSYBOX_XXD > > config VIM_XXD > - depends on !BUSYBOX_XXD > + depends on !BUSYBOX_XXD || ALLYES > bool "XXD" > > endif > diff --git a/rules/vim.make b/rules/vim.make > index b03778e53f53..8700b70bdd82 100644 > --- a/rules/vim.make > +++ b/rules/vim.make > @@ -103,6 +103,10 @@ VIM_INSTALL_OPT := \ > > VIM_LINKS := ex rview rvim view vimdiff > > +ifdef PTXCONF_VIM_VI_SYMLINK > +VIM_LINKS += vi > +endif > + > $(STATEDIR)/vim.targetinstall: > @$(call targetinfo) >
