MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

recipetool: ensure git clone is standalone when extracting

Browse Source 
If -x is specified and the specified URI was a git repository, we need
to ensure that the resulting clone is a sandalone and not one that has
pointers into the temporary fetch location or DL_DIR (since the git
fetcher does a local clone with -s). Split out the code from devtool
that already does this for "devtool modify -x" and reuse that.

(From OE-Core rev: fc47e8652ef32e7399f57c80593df90dc52d8b84)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2015-04-28 12:25:30 +01:00 committed by Richard Purdie
parent 24e5ad268c
commit a4fca1d523
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/devtool/standard.py
View File

@ -23,6 +23,7 @@ import glob
import tempfile import tempfile
import logging import logging
import argparse import argparse
import scriptutils
from devtool import exec_build_env_command, setup_tinfoil from devtool import exec_build_env_command, setup_tinfoil
logger = logging.getLogger('devtool') 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 # 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]) srcsubdir = os.path.join(workdir, os.path.relpath(srcsubdir, workdir).split(os.sep)[0])
if os.path.exists(os.path.join(srcsubdir, '.git')): scriptutils.git_convert_standalone_clone(srcsubdir)
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)
patchdir = os.path.join(srcsubdir, 'patches') patchdir = os.path.join(srcsubdir, 'patches')
haspatches = False haspatches = False

2
scripts/lib/recipetool/create.py
View File

@ -22,6 +22,7 @@ import glob
import fnmatch import fnmatch
import re import re
import logging import logging
import scriptutils
logger = logging.getLogger('recipetool') logger = logging.getLogger('recipetool')
@ -238,6 +239,7 @@ def create_recipe(args):
outlines.extend(lines_after) outlines.extend(lines_after)
if args.extract_to: if args.extract_to:
scriptutils.git_convert_standalone_clone(srctree)
shutil.move(srctree, args.extract_to) shutil.move(srctree, args.extract_to)
logger.info('Source extracted to %s' % args.extract_to) logger.info('Source extracted to %s' % args.extract_to)

11
scripts/lib/scriptutils.py
View File

@ -58,3 +58,14 @@ def load_plugins(logger, plugins, pluginpath):
if hasattr(plugin, 'plugin_init'): if hasattr(plugin, 'plugin_init'):
plugin.plugin_init(plugins) plugin.plugin_init(plugins)
plugins.append(plugin) 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)