summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/build_image.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/devtool/build_image.py')
-rw-r--r--scripts/lib/devtool/build_image.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/devtool/build_image.py b/scripts/lib/devtool/build_image.py
index ae75511dc7..e5810389be 100644
--- a/scripts/lib/devtool/build_image.py
+++ b/scripts/lib/devtool/build_image.py
@@ -34,8 +34,8 @@ def _get_packages(tinfoil, workspace, config):
34 result = [] 34 result = []
35 for recipe in workspace: 35 for recipe in workspace:
36 data = parse_recipe(config, tinfoil, recipe, True) 36 data = parse_recipe(config, tinfoil, recipe, True)
37 if 'class-target' in data.getVar('OVERRIDES', True).split(':'): 37 if 'class-target' in data.getVar('OVERRIDES').split(':'):
38 if recipe in data.getVar('PACKAGES', True).split(): 38 if recipe in data.getVar('PACKAGES').split():
39 result.append(recipe) 39 result.append(recipe)
40 else: 40 else:
41 logger.warning("Skipping recipe %s as it doesn't produce a " 41 logger.warning("Skipping recipe %s as it doesn't produce a "
@@ -95,7 +95,7 @@ def build_image_task(config, basepath, workspace, image, add_packages=None, task
95 raise TargetNotImageError() 95 raise TargetNotImageError()
96 96
97 # Get the actual filename used and strip the .bb and full path 97 # Get the actual filename used and strip the .bb and full path
98 target_basename = rd.getVar('FILE', True) 98 target_basename = rd.getVar('FILE')
99 target_basename = os.path.splitext(os.path.basename(target_basename))[0] 99 target_basename = os.path.splitext(os.path.basename(target_basename))[0]
100 config.set('SDK', 'target_basename', target_basename) 100 config.set('SDK', 'target_basename', target_basename)
101 config.write() 101 config.write()
@@ -132,9 +132,9 @@ def build_image_task(config, basepath, workspace, image, add_packages=None, task
132 afile.write('%s\n' % line) 132 afile.write('%s\n' % line)
133 133
134 if task in ['populate_sdk', 'populate_sdk_ext']: 134 if task in ['populate_sdk', 'populate_sdk_ext']:
135 outputdir = rd.getVar('SDK_DEPLOY', True) 135 outputdir = rd.getVar('SDK_DEPLOY')
136 else: 136 else:
137 outputdir = rd.getVar('DEPLOY_DIR_IMAGE', True) 137 outputdir = rd.getVar('DEPLOY_DIR_IMAGE')
138 138
139 tmp_tinfoil = tinfoil 139 tmp_tinfoil = tinfoil
140 tinfoil = None 140 tinfoil = None