From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 21 Jan 2022 15:25:08 +0100
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 1nAuqi-008qqm-Rs
	for lore@lore.pengutronix.de; Fri, 21 Jan 2022 15:25:08 +0100
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 1nAuqh-00059m-5p; Fri, 21 Jan 2022 15:25:07 +0100
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 1nAuq2-0004pe-G4; Fri, 21 Jan 2022 15:24:26 +0100
Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1nAuq2-00BaCo-Ee; Fri, 21 Jan 2022 15:24:25 +0100
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1nAuq1-008xr6-0l; Fri, 21 Jan 2022 15:24:25 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 21 Jan 2022 15:24:25 +0100
Message-Id: <20220121142425.2136665-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220119155544.3364301-1-bst@pengutronix.de>
References: <20220119155544.3364301-1-bst@pengutronix.de>
MIME-Version: 1.0
Subject: Re: [ptxdist] [APPLIED] vim: fix xxd install location
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: Bastian Krause <bst@pengutronix.de>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
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 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