summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorChristopher Clark <christopher.w.clark@gmail.com>2017-10-03 12:03:26 -0700
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-10-04 16:54:37 -0400
commit58e10e543f0fef2e8cdea1af84c5a11fff9cc900 (patch)
tree083e89b33d572282b0b8f270f70de288e2d68b42 /recipes-extended
parentf0e708ea8c88ff9efce91bdd70432acbe53fec87 (diff)
downloadmeta-virtualization-58e10e543f0fef2e8cdea1af84c5a11fff9cc900.tar.gz
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 <christopher.clark6@baesystems.com> Reported-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/images/xen-guest-image-minimal.bb5
1 files changed, 0 insertions, 5 deletions
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
13IMAGE_INSTALL_append_x86-64 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}" 13IMAGE_INSTALL_append_x86-64 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
14IMAGE_INSTALL_append_x86 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}" 14IMAGE_INSTALL_append_x86 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
15 15
16# When xf86-video-vesa is not present, add opengl and don't require wayland:
17DISTRO_FEATURES_append = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', \
18 bb.utils.contains('IMAGE_INSTALL', 'xf86-video-vesa', '', ' opengl', d), '', d)}"
19DISTRO_FEATURES_remove = "${@bb.utils.contains('IMAGE_INSTALL', 'xf86-video-vesa', '', 'wayland', d)}"
20
21REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' x11', '', d)} xen" 16REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' x11', '', d)} xen"
22 17
23LICENSE = "MIT" 18LICENSE = "MIT"