summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/__init__.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index 07d774dfb7..89f098a912 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -220,6 +220,20 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None):
220 commit_cmd += ['-m', commitmsg] 220 commit_cmd += ['-m', commitmsg]
221 bb.process.run(commit_cmd, cwd=repodir) 221 bb.process.run(commit_cmd, cwd=repodir)
222 222
223 # Ensure singletask.lock (as used by externalsrc.bbclass) is ignored by git
224 excludes = []
225 excludefile = os.path.join(repodir, '.git', 'info', 'exclude')
226 try:
227 with open(excludefile, 'r') as f:
228 excludes = f.readlines()
229 except FileNotFoundError:
230 pass
231 if 'singletask.lock\n' not in excludes:
232 excludes.append('singletask.lock\n')
233 with open(excludefile, 'w') as f:
234 for line in excludes:
235 f.write(line)
236
223 bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) 237 bb.process.run('git checkout -b %s' % devbranch, cwd=repodir)
224 bb.process.run('git tag -f %s' % basetag, cwd=repodir) 238 bb.process.run('git tag -f %s' % basetag, cwd=repodir)
225 239