summaryrefslogtreecommitdiffstats
path: root/meta/classes/image_types_wic.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* image_types_wic.bbclass: tighten dependency to help do_rm_work_allPatrick Ohly2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | Depending on wic-tools:do_build pulls a lot of additional, indirect dependencies into the image sysroot during do_image_wic as soon as rm_work.bbclass is active, because then we have do_build->do_rm_work_all->[all dependencies]. One of those dependencies is libgcc-initial, which clashes with libgcc itself, leading to errors in extend_recipe_sysroot like this: Exception: FileExistsError: [Errno 17] File exists: '.../tmp/sysroots-components/corei7-64/glibc-initial/usr/include/fstab.h' -> '.../tmp/work/intel_corei7_64-poky-linux/core-image-minimal/1.0-r0/recipe-sysroot/usr/include/fstab.h' As the image recipe only needs the sysroot of wic-tools and does not need to wait for the build of wic-tools to finish, depending on do_populate_sysroot is the better choice and happens to avoid the problem above. (From OE-Core rev: a678f54e710e46b3cf674ffa41d6432b22effbdf) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: add WKS_FILE_DEPENDS variableEd Bartosh2017-03-041-0/+2
| | | | | | | | | | | This variable should be used to specify dependencies that will be added to DEPENDS only if wic image build is 'active' i.e. when 'wic' is in IMAGE_FSTYPES. (From OE-Core rev: 243ccd6b8b389231f6c4a8e251c2bd6b2cf6eaad) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image_types_wic: fix expansion errorEd Bartosh2017-02-231-1/+1
| | | | | | | | | | | | | | | | | | | Variable WKS_SEARCH_PATH was not fully expanded when used directly in this expression: WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}" This caused expansion error: bb.data_smart.ExpansionError: Failure expanding variable WKS_FULL_PATH, .... which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH, line 1) Calling d.getVar instead of directly referencing variables should fix the issue. (From OE-Core rev: 20f8fddd28fe46d7e694804de3d894cdf9f7c636) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image_types_wic: remove dependency to do_bootimgEd Bartosh2017-02-051-5/+0
| | | | | | | | | | | Removing task dependency do_wic -> do_bootimg as wic doesn't depend on hddimg/booimg anymore. (From OE-Core rev: af52d878940babb88bc8a2650e8c0115b6ccaf9f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image: rename image-wic -> image_types_wicEd Bartosh2017-02-051-0/+120
Make name of the wic image type class consistent with existing naming scheme for image types. (From OE-Core rev: 4aab1b77d5f9403cbb3fae790069ef54821491fb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>