From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Wed, 12 Apr 2023 08:30:34 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pmU01-000nOo-Jj
	for lore@lore.pengutronix.de; Wed, 12 Apr 2023 08:30:34 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1pmU01-0002Dd-OK; Wed, 12 Apr 2023 08:30:33 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pmTzN-00086I-QX; Wed, 12 Apr 2023 08:29:53 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pmTzN-00AfpW-3f; Wed, 12 Apr 2023 08:29:53 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pmTzM-00EPiU-2n; Wed, 12 Apr 2023 08:29:52 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Wed, 12 Apr 2023 08:29:52 +0200
Message-Id: <20230412062952.3435439-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230404210435.3363032-1-rhi@pengutronix.de>
References: <20230404210435.3363032-1-rhi@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] vim: prevent file name conflicts with
 busybox
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
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.ext.pengutronix.de); SAEximRunCond expanded to false

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