From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Wed, 21 Jun 2023 10:52:26 +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 <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1qBtZj-00FS4c-Ir
	for lore@lore.pengutronix.de; Wed, 21 Jun 2023 10:52:26 +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 <ptxdist-bounces@pengutronix.de>)
	id 1qBtZf-0008MV-Vt; Wed, 21 Jun 2023 10:52:23 +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 <mol@pengutronix.de>)
 id 1qBtYe-0006Dz-Gm; Wed, 21 Jun 2023 10:51:20 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1qBtYd-008za5-OD; Wed, 21 Jun 2023 10:51:19 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1qBtYd-00Aizd-0j;
 Wed, 21 Jun 2023 10:51:19 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Wed, 21 Jun 2023 10:51:19 +0200
Message-Id: <20230621085119.2556127-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230619130210.5302-1-t.scherer@eckelmann.de>
References: <20230619130210.5302-1-t.scherer@eckelmann.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] ptxd_make_world_patchin: Allow git-ptx-*
 scripts to be overwritten
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: Thorsten Scherer <t.scherer@eckelmann.de>
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 f4d2f09da9dfd9977c091f93e8284740e159ac01.

Michael

[sent from post-receive hook]

On Wed, 21 Jun 2023 10:51:19 +0200, Thorsten Scherer <t.scherer@eckelmann.de> wrote:
> This patch enables the user to make local modifications to
> git-ptx-patches and git-ptx-refresh-tags-editor inside the BSP.
> 
> Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
> Message-Id: <20230619130210.5302-1-t.scherer@eckelmann.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
> index 026c36e95206..209fc69547aa 100644
> --- a/scripts/lib/ptxd_make_world_patchin.sh
> +++ b/scripts/lib/ptxd_make_world_patchin.sh
> @@ -62,6 +62,14 @@ ptxd_make_world_patchin_apply_git_init()
>      local git_dir
>      git_dir="$(git rev-parse --git-dir 2> /dev/null)" || true
>  
> +    local git_ptx_patches
> +    ptxd_in_path PTXDIST_PATH_SCRIPTS git-ptx-patches
> +    git_ptx_patches="${ptxd_reply}"
> +
> +    local git_ptx_refresh_tags_editor
> +    ptxd_in_path PTXDIST_PATH_SCRIPTS git-ptx-refresh-tags-editor
> +    git_ptx_refresh_tags_editor="${ptxd_reply}"
> +
>      # is already git repo?
>      if [ "${git_dir}" != ".git" ]; then
>  	echo "patchin: git: initializing repository"
> @@ -70,8 +78,8 @@ ptxd_make_world_patchin_apply_git_init()
>  	__git commit -q -m "initial commit" --author="ptxdist-${PTXDIST_VERSION_FULL} <ptxdist@pengutronix.de>" &&
>  	__git tag "${pkg_pkg//\~/-}" &&
>  	__git tag base &&
> -	__git config alias.ptx-patches "!${PTXDIST_TOPDIR}/scripts/git-ptx-patches \"\${@}\"" &&
> -	__git config sequence.editor "${PTXDIST_TOPDIR}/scripts/git-ptx-refresh-tags-editor" &&
> +	__git config alias.ptx-patches "!${git_ptx_patches} \"\${@}\"" &&
> +	__git config core.editor "${git_ptx_refresh_tags_editor}" &&
>  	__git config diff.renames false &&
>  	__git config core.abbrev 12 &&
>  	__git config core.autocrlf false &&