[OE-core] [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT

[Ming Liu]

Hi, Ed:

Thanks for testing it, I will investigate the cause and get back to you.

the best,
thank you

2017-08-02 10:26 GMT+02:00 Ed Bartosh <ed.bartosh at linux.intel.com>:

> On Tue, Aug 01, 2017 at 07:13:48PM +0200, liu.ming50 at gmail.com wrote:
> > From: Ming Liu <peter.x.liu at external.atlascopco.com>
> >
> > Drop do_image_wic depends varflags, move the dependencies to
> > WKS_FILE_DEPENDS_DEFAULT. I can not see the need to maintain them
> > in two different ways, besides that it's out of USING_WIC control.
> >
> > Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
> > ---
> >  meta/classes/image_types_wic.bbclass | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/meta/classes/image_types_wic.bbclass
> b/meta/classes/image_types_wic.bbclass
> > index b825b47..7b0a1c7 100644
> > --- a/meta/classes/image_types_wic.bbclass
> > +++ b/meta/classes/image_types_wic.bbclass
> > @@ -39,9 +39,8 @@ 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"
> > +WKS_FILE_DEPENDS_DEFAULT = "parted-native gptfdisk-native
> dosfstools-native mtools-native syslinux-native bmap-tools-native
> cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-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"
>
> This breakes wic build on qemux86-64 target on my machine with the
> error: "ERROR: A native program parted required to build the image was not
> found (see details above)."
>
> --
> Regards,
> Ed
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170802/de4e1bcf/attachment-0002.html>