From: Ming Liu <[email protected]> Let WKS_FILE_DEPENDS_DEFAULT default to include all native recipes listed in NATIVE_RECIPES of wic, as a temporary solution to avoid breaking wic image build.
Recommended solution is to use WKS_FILE_DEPENDS in image recipes together with WKS_FILE to specify dependencies. Drop do_image_wic depends varflags, it's not needed any more, all the dependencies will be handled by WKS_FILE_DEPENDS. Signed-off-by: Ming Liu <[email protected]> --- meta/classes/image_types_wic.bbclass | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index b825b47..ad578c4 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -39,9 +39,26 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" 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] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}" -WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" +# Defaults to include all native recipes listed in NATIVE_RECIPES of +# wic, as a temporary solution to avoid breaking wic image build. +# Recommended solution is to use WKS_FILE_DEPENDS in image recipes +# together with WKS_FILE to specify dependencies. +WKS_FILE_DEPENDS_DEFAULT = "\ + bmap-tools-native \ + grub-efi-native \ + syslinux-native \ + mtools-native \ + dosfstools-native \ + cdrtools-native \ + btrfs-tools-native \ + e2fsprogs-native \ + squashfs-tools-native \ + util-linux-native \ + parted-native \ + gptfdisk-native \ +" + WKS_FILE_DEPENDS_BOOTLOADERS = "" WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
