From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 04 Apr 2023 23:05:18 +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 ) id 1pjnq9-00A7GW-Oj for lore@lore.pengutronix.de; Tue, 04 Apr 2023 23:05:18 +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 ) id 1pjnq8-0005Uq-Sv; Tue, 04 Apr 2023 23:05:16 +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 ) id 1pjnpa-0005Uc-L4; Tue, 04 Apr 2023 23:04:42 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pjnpa-0090Kz-0M; Tue, 04 Apr 2023 23:04:42 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pjnpY-00E6sf-Sc; Tue, 04 Apr 2023 23:04:40 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Date: Tue, 4 Apr 2023 23:04:35 +0200 Message-Id: <20230404210435.3363032-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber 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.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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