From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 May 2024 11:13:06 +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 1s2oyY-00GzSQ-1i for lore@lore.pengutronix.de; Fri, 03 May 2024 11:13:06 +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 1s2oyX-0003IA-Rz; Fri, 03 May 2024 11:13:05 +0200 Received: from smtp77.iad3a.emailsrvr.com ([173.203.187.77]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s2oyI-0003HM-Ed for ptxdist@pengutronix.de; Fri, 03 May 2024 11:12:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1714727569; bh=4HUIFcV1Z8xahD17CzzcnUE93Rv3lflAoc5luZJrhdU=; h=Date:Subject:To:From:From; b=Z0pt4BY9sXZDEWfd7qtLMF3hJgP+MIE0UTNOY19YGghG8bgMQNXPMEhUmy6rlzRdv RNlZkaqXPVGJLUPJcv7V/mRO5QQr65bD1g3yFNjRGKGb9Gu+rSwpL1AYiOK4ehXHsy qbrFSljSUgA+I+6o5WjXYKjGoLU2625ZBwPLw8dc= X-Auth-ID: abbotti@mev.co.uk Received: by smtp18.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id D4234230DD for ; Fri, 3 May 2024 05:12:48 -0400 (EDT) Message-ID: Date: Fri, 3 May 2024 10:12:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-GB To: ptxdist@pengutronix.de References: <20240502145322.141754-1-abbotti@mev.co.uk> <20240503-evade-jumble-3c1c96970cb1@thorsis.com> From: Ian Abbott Organization: MEV Ltd. In-Reply-To: <20240503-evade-jumble-3c1c96970cb1@thorsis.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Classification-ID: 96fd1c1c-d407-4b64-8162-8e7d2f72c9ca-1-1 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.5 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH] 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 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 On 03/05/2024 07:59, Alexander Dahl wrote: > Hello Ian, > > I like the idea. Maybe it confuses users if 'vi' calls busybox and > 'vim' the full featured Vim, but I appreciate it anyway. More > feedback below. Thanks for the review. Feedback below. > Am Thu, May 02, 2024 at 03:53:22PM +0100 schrieb Ian Abbott: >> --- a/rules/vim.in >> +++ b/rules/vim.in >> @@ -1,15 +1,7 @@ >> ## 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 NCURSES >> prompt "vim " >> help >> Vim is an advanced text editor that seeks to provide the >> @@ -18,12 +10,20 @@ menuconfig VIM >> >> if VIM >> >> -comment "BusyBox' vi is selected!" >> - depends on BUSYBOX_VI >> - >> config VIM_VIM >> - depends on !BUSYBOX_VI >> bool "Vim Editor" >> + select LIBC_DL >> + select LIBC_M >> + select GCCLIBS_GCC_S >> + select NCURSES > > Don't move this to the suboption, keep it in the original place but > add 'if VIM_VIM' like this: > > select LIBC_DL if VIM_VIM > > This avoids dependency problems, it's also in documentation: > https://www.ptxdist.org/doc/dev_advanced_rule_files.html#managing-external-compile-time-dependencies-on-demand OK, that makes sense. >> + >> +comment "BusyBox' vi is selected!" >> + depends on VIM_VIM && BUSYBOX_VI >> + >> +config VIM_VI_SYMLINK >> + depends on VIM_VIM && !BUSYBOX_VI > > The !BUSYBOX_VI is redundant, but I guess one can keep it. I'm not sure why it's redundant. I don't want this option and BUSYBOX_VI fighting over the symlink to /usr/bin/vi in the image. > > Greets > Alex > >> + bool "install symbolic link /usr/bin/vi" >> + default y >> >> comment "BusyBox' xxd is selected!" >> depends on BUSYBOX_XXD >> diff --git a/rules/vim.make b/rules/vim.make >> index b03778e53..8700b70bd 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) >> >> -- >> 2.43.0 >> >> Thanks again. I'll submit a v2 patch shortly. -- -=( Ian Abbott || MEV Ltd. is a company )=- -=( registered in England & Wales. Regd. number: 02862268. )=- -=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=- -=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-