diff options
Diffstat (limited to 'poky/scripts/lib/devtool')
| -rw-r--r-- | poky/scripts/lib/devtool/__init__.py | 7 | ||||
| -rw-r--r-- | poky/scripts/lib/devtool/standard.py | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/poky/scripts/lib/devtool/__init__.py b/poky/scripts/lib/devtool/__init__.py index 6ebe368a9..702db669d 100644 --- a/poky/scripts/lib/devtool/__init__.py +++ b/poky/scripts/lib/devtool/__init__.py @@ -212,8 +212,13 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): bb.process.run(commit_cmd, cwd=repodir) # Ensure singletask.lock (as used by externalsrc.bbclass) is ignored by git + gitinfodir = os.path.join(repodir, '.git', 'info') + try: + os.mkdir(gitinfodir) + except FileExistsError: + pass excludes = [] - excludefile = os.path.join(repodir, '.git', 'info', 'exclude') + excludefile = os.path.join(gitinfodir, 'exclude') try: with open(excludefile, 'r') as f: excludes = f.readlines() diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index d140b97de..261d642d4 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -531,7 +531,6 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works initial_rev = None - appendexisted = False recipefile = d.getVar('FILE') appendfile = recipe_to_append(recipefile, config) is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d) |