From 58e10e543f0fef2e8cdea1af84c5a11fff9cc900 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Tue, 3 Oct 2017 12:03:26 -0700 Subject: xen-guest-image-minimal: remove lines modifying DISTRO_FEATURES 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 Reported-by: Mark Hatle Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-guest-image-minimal.bb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/images/xen-guest-image-minimal.bb b/recipes-extended/images/xen-guest-image-minimal.bb index bca60178..d311eaef 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" -- cgit v1.2.3-54-g00ecf