merged. Bruce
On Tue, Oct 3, 2017 at 3:03 PM, <christopher.w.cl...@gmail.com> wrote: > From: Christopher Clark <christopher.w.cl...@gmail.com> > > Remove recipe lines modifying DISTRO_FEATURES that were intended to > simplify the non-x86 x11 image dependencies, but did not. > > Signed-off-by: Christopher Clark <christopher.cla...@baesystems.com> > Reported-by: Mark Hatle <mark.ha...@windriver.com> > --- > > recipes-extended/images/xen-guest-image-minimal.bb | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/recipes-extended/images/xen-guest-image-minimal.bb > b/recipes-extended/images/xen-guest-image-minimal.bb > index bca6017..d311eae 100644 > --- a/recipes-extended/images/xen-guest-image-minimal.bb > +++ b/recipes-extended/images/xen-guest-image-minimal.bb > @@ -13,11 +13,6 @@ IMAGE_INSTALL += "${@bb.utils.contains('IMAGE_FEATURES', > 'x11', ' xf86-video-fbd > IMAGE_INSTALL_append_x86-64 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', > ' xf86-video-vesa', '', d)}" > IMAGE_INSTALL_append_x86 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', > ' xf86-video-vesa', '', d)}" > > -# When xf86-video-vesa is not present, add opengl and don't require wayland: > -DISTRO_FEATURES_append = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', \ > - bb.utils.contains('IMAGE_INSTALL', > 'xf86-video-vesa', '', ' opengl', d), '', d)}" > -DISTRO_FEATURES_remove = "${@bb.utils.contains('IMAGE_INSTALL', > 'xf86-video-vesa', '', 'wayland', d)}" > - > REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' > x11', '', d)} xen" > > LICENSE = "MIT" > -- > 2.7.4 > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- _______________________________________________ meta-virtualization mailing list meta-virtualization@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-virtualization