From: Thorsten Scherer <t.scherer@eckelmann.de>
To: ptxdist@pengutronix.de
Cc: Thorsten Scherer <t.scherer@eckelmann.de>
Subject: [ptxdist] [PATCH] ptxd_make_world_patchin: Allow git-ptx-* scripts to be overwritten
Date: Mon, 19 Jun 2023 15:02:10 +0200 [thread overview]
Message-ID: <20230619130210.5302-1-t.scherer@eckelmann.de> (raw)
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>
---
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} <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 &&
--
2.38.0
next reply other threads:[~2023-06-19 13:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 13:02 Thorsten Scherer [this message]
2023-06-21 8:51 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-06-21 8:55 ` [ptxdist] [PATCH] " Michael Olbrich
2023-06-21 10:00 ` Thorsten Scherer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230619130210.5302-1-t.scherer@eckelmann.de \
--to=t.scherer@eckelmann.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox