[oe] [meta-efl][meta-oe 08/15] task-x11: remove server parts and add VIRTUAL_RUNTIME variables to be able to select different -common and init providers

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../tasks/{task-x11.bb => task-x11_1.0.bb}         |   27 ++++++--------------
 1 files changed, 8 insertions(+), 19 deletions(-)
 rename meta-oe/recipes-core/tasks/{task-x11.bb => task-x11_1.0.bb} (46%)

diff --git a/meta-oe/recipes-core/tasks/task-x11.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
similarity index 46%
rename from meta-oe/recipes-core/tasks/task-x11.bb
rename to meta-oe/recipes-core/tasks/task-x11_1.0.bb
index a7faa00..67ff93b 100644
--- a/meta-oe/recipes-core/tasks/task-x11.bb
+++ b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
@@ -2,37 +2,26 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PV = "1.0"
-PR = "r8"
-
-# WORK IN PROGRESS
+PR = "r9"
 
 inherit task
 
-PACKAGES += "\
-  ${PN}-server \
-  ${PN}-utils \
-"
+PACKAGES += "${PN}-utils"
 
 RRECOMMENDS_${PN} = "\
   ${PN}-server \
   ${PN}-utils \
 "
 
-# Some machines don't set a *runtime* provider for X, so default to Xfbdev here
-# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
-XSERVER ?= "xserver-xorg"
-XSERVER_COMMON ?= "xserver-common"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
 
-RDEPENDS_${PN}-server = "\
-  ${XSERVER} \
-"
+# elsa, xserver-nodm-init
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
 RDEPENDS_${PN}-utils = "\
-  ${XSERVER_COMMON} \
-  xserver-nodm-init \
+  ${VIRTUAL-RUNTIME_xserver_common} \
+  ${VIRTUAL-RUNTIME_graphical_init_manager} \
   xauth \
   xhost \
   xset \
-- 
1.7.7.1