From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 12 May 2024 15:17:34 +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 1s6954-00Avwv-0g for lore@lore.pengutronix.de; Sun, 12 May 2024 15:17:34 +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 1s6953-0004AT-Si; Sun, 12 May 2024 15:17:33 +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 1s694C-0002g8-TY; Sun, 12 May 2024 15:16:40 +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 1s694C-000zYO-Ev; Sun, 12 May 2024 15:16:40 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1s694C-00FXSx-1L; Sun, 12 May 2024 15:16:40 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 12 May 2024 15:16:40 +0200 Message-Id: <20240512131640.3703556-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240503180814.636648-1-abbotti@mev.co.uk> References: <20240503180814.636648-1-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] vim: allow vim to be installed alongside busybox vi and xxd 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 e859fea01e033f691efac8124902478f8496233c. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:40 +0200, Ian Abbott 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 > Message-Id: <20240503180814.636648-1-abbotti@mev.co.uk> > Signed-off-by: Michael Olbrich > > 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) >