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
Jamin Lin (5):
devtool: Detect nested git repos before the initial workspace commit
oe/patch: Skip commitIgnored when nothing is actually staged
devtool-source: Convert nested git SRC_URI destsuffix repos to
standalone clones
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 | 64 ++++++++++++-------
5 files changed, 160 insertions(+), 23 deletions(-)
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-multi-destsuffix_git.bb
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#241783):
https://lists.openembedded.org/g/openembedded-core/message/241783
Mute This Topic: https://lists.openembedded.org/mt/120407642/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
