From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 21 Jun 2023 10:55:23 +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 ) id 1qBtca-00FSC1-WE for lore@lore.pengutronix.de; Wed, 21 Jun 2023 10:55:23 +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 ) id 1qBtcX-0000Qk-Uu; Wed, 21 Jun 2023 10:55:21 +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 ) id 1qBtcP-0000QS-Sj; Wed, 21 Jun 2023 10:55:13 +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 ) id 1qBtcP-008zaP-5O; Wed, 21 Jun 2023 10:55:13 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qBtcO-00AxlB-0z; Wed, 21 Jun 2023 10:55:12 +0200 Date: Wed, 21 Jun 2023 10:55:12 +0200 From: Michael Olbrich To: Thorsten Scherer Message-ID: Mail-Followup-To: Thorsten Scherer , ptxdist@pengutronix.de References: <20230619130210.5302-1-t.scherer@eckelmann.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230619130210.5302-1-t.scherer@eckelmann.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] 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 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.ext.pengutronix.de); SAEximRunCond expanded to false On Mon, Jun 19, 2023 at 03:02:10PM +0200, Thorsten Scherer wrote: > This patch enables the user to make local modifications to > git-ptx-patches and git-ptx-refresh-tags-editor inside the BSP. Out of curiosity: Do you have real local changes, or is this just to be able to backport fixes in the future? Regards, Michael > Signed-off-by: Thorsten Scherer > --- > scripts/lib/ptxd_make_world_patchin.sh | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh > index 026c36e95..209fc6954 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} " && > __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 && > -- > 2.38.0 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |