diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-21 17:09:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 10:42:32 +0000 |
| commit | 243ccd6b8b389231f6c4a8e251c2bd6b2cf6eaad (patch) | |
| tree | 4a462640740a2a07ad827fc83ff62f4f16cf03b6 | |
| parent | d994340ec32ec04226ec185a8998775602c8b8bf (diff) | |
| download | openembedded-core-contrib-243ccd6b8b389231f6c4a8e251c2bd6b2cf6eaad.tar.gz | |
wic: add WKS_FILE_DEPENDS variable
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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
| -rw-r--r-- | meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 | ||||
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 9e93b8e1a9..b687935c49 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -6,7 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" IMAGE_FSTYPES = "wic" -DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" +WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index d012a5d5ca..500c8c5653 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -40,6 +40,8 @@ USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" do_image_wic[depends] += "wic-tools:do_build" +WKS_FILE_DEPENDS ??= '' +DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }" python do_write_wks_template () { """Write out expanded template contents to WKS_FULL_PATH.""" |