mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "devtool: make add_md5 a public API"

Browse Source 
This reverts commit 69c63728da.

Moved add_md5 back to standard.py as it's not used in
any plugin anymore.

(From OE-Core rev: 3823b7abf8c1e82e0448d7283de95422fd262135)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-08-30 17:12:50 +03:00
committed by Richard Purdie
parent 71fdc64b8a
commit 7eb7dc861f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/devtool/__init__.py
View File

@@ -110,13 +110,6 @@ def setup_tinfoil(config_only=False):
tinfoil.logger.setLevel(logger.getEffectiveLevel())
return tinfoil
def add_md5(config, recipename, filename):
"""Record checksum of a recipe to the md5-file of the workspace"""
import bb.utils
md5 = bb.utils.md5_file(filename)
with open(os.path.join(config.workspace_path, '.devtool_md5'), 'a') as f:
f.write('%s|%s|%s\n' % (recipename, os.path.relpath(filename, config.workspace_path), md5))
def get_recipe_file(cooker, pn):
"""Find recipe file corresponding a package name"""
import oe.recipeutils

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

@@ -26,7 +26,7 @@ import argparse
import scriptutils
import errno
from devtool import exec_build_env_command, setup_tinfoil, DevtoolError
from devtool import add_md5, parse_recipe
from devtool import parse_recipe
logger = logging.getLogger('devtool')
@@ -105,7 +105,7 @@ def add(args, config, basepath, workspace):
except bb.process.ExecutionError as e:
raise DevtoolError('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
add_md5(config, args.recipename, recipefile)
_add_md5(config, args.recipename, recipefile)
initial_rev = None
if os.path.exists(os.path.join(srctree, '.git')):
@@ -121,7 +121,7 @@ def add(args, config, basepath, workspace):
if initial_rev:
f.write('\n# initial_rev: %s\n' % initial_rev)
add_md5(config, args.recipename, appendfile)
_add_md5(config, args.recipename, appendfile)
return 0
@@ -344,6 +344,13 @@ def _extract_source(srctree, keep_temp, devbranch, d):
shutil.rmtree(tempdir)
return initial_rev
def _add_md5(config, recipename, filename):
"""Record checksum of a recipe to the md5-file of the workspace"""
import bb.utils
md5 = bb.utils.md5_file(filename)
with open(os.path.join(config.workspace_path, '.devtool_md5'), 'a') as f:
f.write('%s|%s|%s\n' % (recipename, os.path.relpath(filename, config.workspace_path), md5))
def _check_preserve(config, recipename):
"""Check if a recipe was manually changed and needs to be saved in 'attic'
directory"""
@@ -471,7 +478,7 @@ def modify(args, config, basepath, workspace):
for commit in commits:
f.write('# commit: %s\n' % commit)
add_md5(config, args.recipename, appendfile)
_add_md5(config, args.recipename, appendfile)
logger.info('Recipe %s now set up to build from %s' % (args.recipename, srctree))