From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 May 2024 11:41:07 +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 1s2pPe-00H2LB-39 for lore@lore.pengutronix.de; Fri, 03 May 2024 11:41:07 +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 1s2pPe-0007kQ-Ay; Fri, 03 May 2024 11:41:06 +0200 Received: from mail.thorsis.com ([2003:a:e28:26e4::10]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s2pPN-0007kH-LC for ptxdist@pengutronix.de; Fri, 03 May 2024 11:40:50 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2315E1484E38; Fri, 3 May 2024 11:40:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1714729248; h=from:subject:date:message-id:to:cc:mime-version:content-type: in-reply-to:references; bh=bsTjSwwoDotN6uUDm+VbdRZCLkA3Uh2fwZJGI9bj/yE=; b=ijj1jsKFG34I2lKhrWJRDPHbfRvIOqvSPZseo2NqSUJ9Htcf+kqiDXrrlZc9xH8tKdMLzt 6KumnGsOIz6Da7ZuYO0T9rQaBxKo5f5ERwbc31S5UN3pZy5+bNhdyLN8IC933kMMjihprP 957z6oVNH2cNC+teLxwynslz1liO2E9ue75ZMo436OREE2Px41Rp+q3iwcpfx9WAZVIMFi XIRrpVbhYAvAijBMh513a87xa17WfL2XgXXwAj5XmaR9KyNHiYNePdbDzkr7nFRcBxi7Jk lYTcSCRpsDYrHtuOcrGBb3whkrWPlIQBZ5qZk+JpsuCWswwjdWGdoyCi8HtVHg== Date: Fri, 3 May 2024 11:40:46 +0200 From: Alexander Dahl To: Ian Abbott Message-ID: <20240503-amiss-veteran-105160060dfa@thorsis.com> Mail-Followup-To: Ian Abbott , ptxdist@pengutronix.de References: <20240502145322.141754-1-abbotti@mev.co.uk> <20240503-evade-jumble-3c1c96970cb1@thorsis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.2.12 (2023-09-09) X-Last-TLS-Session-Version: TLSv1.3 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=-2.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 Cc: 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 Hello Ian, Am Fri, May 03, 2024 at 10:12:47AM +0100 schrieb Ian Abbott: > 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. Right, there should be only one package setting that symlink. What I meant was: VIM_VIM already depends on !BUSYBOX_VI so if VIM_VI_SYMLINK depends on VIM_VIM, then !BUSYBOX_VI is already implicitly satisfied and stating it again is not strictly necessary. IMHO: Keep it in, it better reflects the intention. Greets Alex > > > > > 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 )=- > >