diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 8 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create.py | 2 | ||||
| -rw-r--r-- | scripts/lib/scriptutils.py | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 94b5e0bdd1..f90d464432 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -23,6 +23,7 @@ import glob import tempfile import logging import argparse +import scriptutils from devtool import exec_build_env_command, setup_tinfoil logger = logging.getLogger('devtool') @@ -236,12 +237,7 @@ def _extract_source(srctree, keep_temp, devbranch, d): # Handle if S is set to a subdirectory of the source srcsubdir = os.path.join(workdir, os.path.relpath(srcsubdir, workdir).split(os.sep)[0]) - if os.path.exists(os.path.join(srcsubdir, '.git')): - alternatesfile = os.path.join(srcsubdir, '.git', 'objects', 'info', 'alternates') - if os.path.exists(alternatesfile): - # This will have been cloned with -s, so we need to convert it to a full clone - bb.process.run('git repack -a', cwd=srcsubdir) - os.remove(alternatesfile) + scriptutils.git_convert_standalone_clone(srcsubdir) patchdir = os.path.join(srcsubdir, 'patches') haspatches = False diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 1d5bfd995c..0c413688c0 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -22,6 +22,7 @@ import glob import fnmatch import re import logging +import scriptutils logger = logging.getLogger('recipetool') @@ -238,6 +239,7 @@ def create_recipe(args): outlines.extend(lines_after) if args.extract_to: + scriptutils.git_convert_standalone_clone(srctree) shutil.move(srctree, args.extract_to) logger.info('Source extracted to %s' % args.extract_to) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index e7861268a5..fdf4b5d55d 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -58,3 +58,14 @@ def load_plugins(logger, plugins, pluginpath): if hasattr(plugin, 'plugin_init'): plugin.plugin_init(plugins) plugins.append(plugin) + +def git_convert_standalone_clone(repodir): + """If specified directory is a git repository, ensure it's a standalone clone""" + import bb.process + if os.path.exists(os.path.join(repodir, '.git')): + alternatesfile = os.path.join(repodir, '.git', 'objects', 'info', 'alternates') + if os.path.exists(alternatesfile): + # This will have been cloned with -s, so we need to convert it so none + # of the contents is shared + bb.process.run('git repack -a', cwd=repodir) + os.remove(alternatesfile) |