diff options
-rw-r--r-- | meta/classes/devtool-source.bbclass | 3 | ||||
-rw-r--r-- | scripts/lib/devtool/__init__.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index a02b1e9b0e..4158c20c7e 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass | |||
@@ -232,6 +232,9 @@ python devtool_post_patch() { | |||
232 | bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) | 232 | bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) |
233 | bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) | 233 | bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) |
234 | bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) | 234 | bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) |
235 | if os.path.exists(os.path.join(srcsubdir, '.gitmodules')): | ||
236 | bb.process.run('git submodule foreach --recursive "git tag -f devtool-patched"', cwd=srcsubdir) | ||
237 | |||
235 | } | 238 | } |
236 | 239 | ||
237 | python devtool_post_configure() { | 240 | python devtool_post_configure() { |
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 702db669de..e9e88a5533 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py | |||
@@ -233,6 +233,9 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): | |||
233 | bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) | 233 | bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) |
234 | bb.process.run('git tag -f %s' % basetag, cwd=repodir) | 234 | bb.process.run('git tag -f %s' % basetag, cwd=repodir) |
235 | 235 | ||
236 | if os.path.exists(os.path.join(repodir, '.gitmodules')): | ||
237 | bb.process.run('git submodule foreach --recursive "git tag -f %s"' % basetag, cwd=repodir) | ||
238 | |||
236 | def recipe_to_append(recipefile, config, wildcard=False): | 239 | def recipe_to_append(recipefile, config, wildcard=False): |
237 | """ | 240 | """ |
238 | Convert a recipe file to a bbappend file path within the workspace. | 241 | Convert a recipe file to a bbappend file path within the workspace. |