From: Vijai Kumar K Date: Wed, 26 Aug 2020 16:20:25 +0000 (+0530) Subject: image_types_wic: Add ASSUME_PROVIDED to WICVARS X-Git-Tag: 2020-04.3-dunfell~66 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=105f352abab0a57d6d3a6cf3d75ba4d895e3c254;p=openembedded-core.git image_types_wic: Add ASSUME_PROVIDED to WICVARS Add ASSUME_PROVIDED to WICVARS so that wic can use that when running on bitbake environment. This fixes the below build failure in do_image_wic when --include-path is used in wks file. Signed-off-by: Richard Purdie (cherry picked from commit 04068ff19d2c18c3b915aab6832ad4b48affa07f) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index b83308b45c..196c86814e 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,8 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND \ + ASSUME_PROVIDED" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)}