From: Jamin Lin <jamin_lin@aspeedtech.com>
To: "openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>,
"alex.kanavin@gmail.com" <alex.kanavin@gmail.com>,
"paul@pbarker.dev" <paul@pbarker.dev>,
"mathieu.dubois-briand@bootlin.com"
<mathieu.dubois-briand@bootlin.com>
Cc: Troy Lee <troy_lee@aspeedtech.com>, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v4 0/5] devtool: fix standalone clone conversion for nested git repos
Date: Fri, 31 Jul 2026 09:26:35 +0000 [thread overview]
Message-ID: <20260731092634.1127862-1-jamin_lin@aspeedtech.com> (raw)
When a recipe has multiple git SRC_URI entries with destsuffix values
nested inside S, devtool modify left all but the top-level repo with a
.git/objects/info/alternates file pointing into the downloads cache.
Running 'bitbake -c cleanall' then removed those shared objects, breaking
all subsequent git operations in the workspace.
Fix git_convert_standalone_clone() to walk all git repos nested inside S
and repack each one to a fully standalone clone.
v1:
- Fix git_convert_standalone_clone() to walk all git repos nested
inside S and repack each one to a standalone clone
v2:
- Add selftest recipe devtool-test-multi-destsuffix with six nested
git SRC_URI entries to reproduce the scenario
- Add test_devtool_modify_multi_git_destsuffix_standalone to verify
all nested repos have their alternates removed after devtool modify
and remain usable after 'bitbake -c cleanall'
v3:
- Read SRC_URI directly instead of walking the tree for '.git' dirs -
also fixes repos nested inside another repo's own working tree
- Fix setup_git_repo() to register nested repos as submodules before
the initial commit (was dead code), processing bottom-up to avoid
stale submodule references
- Fix commitIgnored() to skip committing when nothing is staged, so
do_patch no longer fails on a submodule that's dirty only because
of its own nested content
- Simplify test recipe to three genuinely-nested destsuffix entries
(level1/level1/level2/level1/level2/level3), update selftest to match
v4:
- Fix regression from v3:
setup_git_repo() now detects nested repos both for fresh workspace
repos and for recipes whose source is already a git repo (fixes
test_devtool_modify_nested_gitsm).
Jamin Lin (5):
oe/patch: Skip commitIgnored when nothing is actually staged
devtool: Register nested git repos before the initial commit
devtool-source: Make nested destsuffix git repos standalone
meta-selftest: Add devtool-test-multi-destsuffix recipe
oeqa/selftest/devtool: Add test for multiple nested git destsuffix
repos
.../devtool-test-multi-destsuffix_git.bb | 27 +++++++
meta/classes/devtool-source.bbclass | 16 ++++
meta/lib/oe/patch.py | 12 +++
meta/lib/oeqa/selftest/cases/devtool.py | 64 +++++++++++++++
scripts/lib/devtool/__init__.py | 79 +++++++++++++------
5 files changed, 175 insertions(+), 23 deletions(-)
create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multi-destsuffix_git.bb
--
2.43.0
next reply other threads:[~2026-07-31 9:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 9:26 Jamin Lin [this message]
2026-07-31 9:26 ` [PATCH v4 1/5] oe/patch: Skip commitIgnored when nothing is actually staged Jamin Lin
2026-07-31 9:26 ` [PATCH v4 2/5] devtool: Register nested git repos before the initial commit Jamin Lin
2026-07-31 9:26 ` [PATCH v4 3/5] devtool-source: Make nested destsuffix git repos standalone Jamin Lin
2026-07-31 9:26 ` [PATCH v4 4/5] meta-selftest: Add devtool-test-multi-destsuffix recipe Jamin Lin
2026-07-31 9:26 ` [PATCH v4 5/5] oeqa/selftest/devtool: Add test for multiple nested git destsuffix repos Jamin Lin
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=20260731092634.1127862-1-jamin_lin@aspeedtech.com \
--to=jamin_lin@aspeedtech.com \
--cc=alex.kanavin@gmail.com \
--cc=mathieu.dubois-briand@bootlin.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=paul@pbarker.dev \
--cc=troy_lee@aspeedtech.com \
/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