mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] vim: fix xxd install location
@ 2022-01-19 15:55 Bastian Krause
  2022-01-21 14:24 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bastian Krause @ 2022-01-19 15:55 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Installing xxd to /usr/bin/vim is obviously wrong. In case
PTXCONF_VIM_VIM and PTXCONF_VIM_XXD are enabled, vim is even
overwritten. Fix that by installing xxd to /usr/bin/xxd.

Fixes: c538cff7e ("vim: add install options")
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/vim.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/vim.make b/rules/vim.make
index 6965e2537..a21b92f59 100644
--- a/rules/vim.make
+++ b/rules/vim.make
@@ -118,7 +118,7 @@ ifdef PTXCONF_VIM_VIM
 endif
 
 ifdef PTXCONF_VIM_XXD
-	@$(call install_copy, vim, 0, 0, 0755, $(VIM_DIR)/$(VIM_SUBDIR)/xxd/xxd, /usr/bin/vim)
+	@$(call install_copy, vim, 0, 0, 0755, $(VIM_DIR)/$(VIM_SUBDIR)/xxd/xxd, /usr/bin/xxd)
 endif
 	@$(call install_finish, vim)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] vim: fix xxd install location
  2022-01-19 15:55 [ptxdist] [PATCH] vim: fix xxd install location Bastian Krause
@ 2022-01-21 14:24 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-01-21 14:24 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Thanks, applied as d67b82df99ffce2a36870a3805af2d4873a63aed.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 15:24:24 +0100, Bastian Krause <bst@pengutronix.de> wrote:
> Installing xxd to /usr/bin/vim is obviously wrong. In case
> PTXCONF_VIM_VIM and PTXCONF_VIM_XXD are enabled, vim is even
> overwritten. Fix that by installing xxd to /usr/bin/xxd.
> 
> Fixes: c538cff7e ("vim: add install options")
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220119155544.3364301-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vim.make b/rules/vim.make
> index 6965e25370f5..a21b92f590bf 100644
> --- a/rules/vim.make
> +++ b/rules/vim.make
> @@ -118,7 +118,7 @@ ifdef PTXCONF_VIM_VIM
>  endif
>  
>  ifdef PTXCONF_VIM_XXD
> -	@$(call install_copy, vim, 0, 0, 0755, $(VIM_DIR)/$(VIM_SUBDIR)/xxd/xxd, /usr/bin/vim)
> +	@$(call install_copy, vim, 0, 0, 0755, $(VIM_DIR)/$(VIM_SUBDIR)/xxd/xxd, /usr/bin/xxd)
>  endif
>  	@$(call install_finish, vim)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-01-21 14:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-19 15:55 [ptxdist] [PATCH] vim: fix xxd install location Bastian Krause
2022-01-21 14:24 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox