mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

devtool: build-image: delete bbappend at end of build

Browse Source 
Upon further reflection, it seems to me that this bbappend ought to just
be deleted at the end of the build. This keeps things simple; you never
have to remember to delete any files to get back to where you were
before with the image. This means we can also drop the slightly awkward
message reminding the user how to do that. I've also updated the test to
look at the image manifest to determine if the command has worked
instead of looking for the (now deleted) bbappend.

(From OE-Core rev: f6b90bceaedf9bad3d111e6ca1fa79e59f472c73)

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-09-22 17:21:38 +01:00
committed by Richard Purdie
parent ef197f9b99
commit 76084cdfa6
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/devtool/build-image.py
+26 -33
View File
@@ -70,40 +70,33 @@ def build_image(args, config, basepath, workspace):
else:
raise DevtoolError('Specified recipe %s is not an image recipe' % image)
if workspace:
packages = _get_packages(tinfoil, workspace, config)
if packages:
with open(appendfile, 'w') as afile:
# include packages from workspace recipes into the image
afile.write('IMAGE_INSTALL_append = " %s"\n' % ' '.join(packages))
# Generate notification callback devtool_warn_image_extended
afile.write('do_rootfs[prefuncs] += "devtool_warn_image_extended"\n\n')
afile.write("python devtool_warn_image_extended() {\n")
afile.write(" bb.plain('NOTE: %%s: building with additional '\n"
" 'packages due to \"devtool build-image\"'"
" %% d.getVar('PN', True))\n"
" bb.plain('NOTE: delete %%s to clear this' %% \\\n"
" '%s')\n" % os.path.relpath(appendfile, basepath))
afile.write("}\n")
logger.info('Building image %s with the following '
'additional packages: %s', image, ' '.join(packages))
else:
logger.warning('No packages to add, building image %s unmodified', image)
else:
logger.warning('No recipes in workspace, building image %s unmodified', image)
deploy_dir_image = tinfoil.config_data.getVar('DEPLOY_DIR_IMAGE', True)
tinfoil.shutdown()
# run bitbake to build image
try:
exec_build_env_command(config.init_path, basepath,
'bitbake %s' % image, watch=True)
except ExecutionError as err:
return err.exitcode
if workspace:
packages = _get_packages(tinfoil, workspace, config)
if packages:
with open(appendfile, 'w') as afile:
# include packages from workspace recipes into the image
afile.write('IMAGE_INSTALL_append = " %s"\n' % ' '.join(packages))
logger.info('Building image %s with the following '
'additional packages: %s', image, ' '.join(packages))
else:
logger.warning('No packages to add, building image %s unmodified', image)
else:
logger.warning('No recipes in workspace, building image %s unmodified', image)
deploy_dir_image = tinfoil.config_data.getVar('DEPLOY_DIR_IMAGE', True)
tinfoil.shutdown()
# run bitbake to build image
try:
exec_build_env_command(config.init_path, basepath,
'bitbake %s' % image, watch=True)
except ExecutionError as err:
return err.exitcode
finally:
if os.path.isfile(appendfile):
os.unlink(appendfile)
logger.info('Successfully built %s. You can find output files in %s'
% (image, deploy_dir_image))