diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 6874224417..0d5a42197b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -212,19 +212,19 @@ def add(args, config, basepath, workspace): | |||
212 | for fn in os.listdir(recipedir): | 212 | for fn in os.listdir(recipedir): |
213 | _add_md5(config, recipename, os.path.join(recipedir, fn)) | 213 | _add_md5(config, recipename, os.path.join(recipedir, fn)) |
214 | 214 | ||
215 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) | ||
216 | rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, None) | ||
217 | if not rd: | ||
218 | return 1 | ||
219 | |||
215 | if args.fetchuri and not args.no_git: | 220 | if args.fetchuri and not args.no_git: |
216 | setup_git_repo(srctree, args.version, 'devtool') | 221 | setup_git_repo(srctree, args.version, 'devtool', d=tinfoil.config_data) |
217 | 222 | ||
218 | initial_rev = None | 223 | initial_rev = None |
219 | if os.path.exists(os.path.join(srctree, '.git')): | 224 | if os.path.exists(os.path.join(srctree, '.git')): |
220 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) | 225 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) |
221 | initial_rev = stdout.rstrip() | 226 | initial_rev = stdout.rstrip() |
222 | 227 | ||
223 | tinfoil = setup_tinfoil(config_only=True, basepath=basepath) | ||
224 | rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, None) | ||
225 | if not rd: | ||
226 | return 1 | ||
227 | |||
228 | if args.src_subdir: | 228 | if args.src_subdir: |
229 | srctree = os.path.join(srctree, args.src_subdir) | 229 | srctree = os.path.join(srctree, args.src_subdir) |
230 | 230 | ||
@@ -420,7 +420,10 @@ class BbTaskExecutor(object): | |||
420 | 420 | ||
421 | class PatchTaskExecutor(BbTaskExecutor): | 421 | class PatchTaskExecutor(BbTaskExecutor): |
422 | def __init__(self, rdata): | 422 | def __init__(self, rdata): |
423 | import oe.patch | ||
423 | self.check_git = False | 424 | self.check_git = False |
425 | self.useroptions = [] | ||
426 | oe.patch.GitApplyTree.gitCommandUserOptions(self.useroptions, d=rdata) | ||
424 | super(PatchTaskExecutor, self).__init__(rdata) | 427 | super(PatchTaskExecutor, self).__init__(rdata) |
425 | 428 | ||
426 | def exec_func(self, func, report): | 429 | def exec_func(self, func, report): |
@@ -447,7 +450,7 @@ class PatchTaskExecutor(BbTaskExecutor): | |||
447 | 450 | ||
448 | stdout, _ = bb.process.run('git status --porcelain', cwd=srcsubdir) | 451 | stdout, _ = bb.process.run('git status --porcelain', cwd=srcsubdir) |
449 | if stdout: | 452 | if stdout: |
450 | bb.process.run('git add .; git commit -a -m "Committing changes from %s\n\n%s"' % (func, GitApplyTree.ignore_commit_prefix + ' - from %s' % func), cwd=srcsubdir) | 453 | bb.process.run('git add .; git %s commit -a -m "Committing changes from %s\n\n%s"' % (' '.join(self.useroptions), func, GitApplyTree.ignore_commit_prefix + ' - from %s' % func), cwd=srcsubdir) |
451 | 454 | ||
452 | 455 | ||
453 | def _prep_extract_operation(config, basepath, recipename, tinfoil=None): | 456 | def _prep_extract_operation(config, basepath, recipename, tinfoil=None): |
@@ -592,7 +595,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d): | |||
592 | "doesn't use any source or the correct source " | 595 | "doesn't use any source or the correct source " |
593 | "directory could not be determined" % pn) | 596 | "directory could not be determined" % pn) |
594 | 597 | ||
595 | setup_git_repo(srcsubdir, crd.getVar('PV', True), devbranch) | 598 | setup_git_repo(srcsubdir, crd.getVar('PV', True), devbranch, d=d) |
596 | 599 | ||
597 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srcsubdir) | 600 | (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srcsubdir) |
598 | initial_rev = stdout.rstrip() | 601 | initial_rev = stdout.rstrip() |