task-x11*: remove in favor of packagegroup-core-x11* variants from oe-core

* packagegroup-core-x11* allows to remove task-x11-server and
  task-x11 from meta-oe without loosing any functionality
* be carefull with 2 changed default values:
  XSERVER does not include xf86-input-mouse and xf86-input-keyboard
  VIRTUAL-RUNTIME_xserver_common defaults to x11-common in oe-core
  and to xserver-common in meta-oe's task-x11

(From meta-openembedded rev: ba89801d4dc6b7c79d2f0e333e424d14a64c786a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf
index dcacb32..abb8d47 100644 (file)
--- a/meta-openembedded/meta-oe/conf/layer.conf
+++ b/meta-openembedded/meta-oe/conf/layer.conf
@@ -26,7 +26,6 @@ BBFILE_PRIORITY_openembedded-layer = "6"
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal-xinput \
   mplayer-common \
-  task-x11-server \
   fbset-modes \
   gpsd-machine-conf \
 "

diff --git a/meta-openembedded/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb b/meta-openembedded/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
deleted file mode 100644 (file)
index 7e43d55..0000000
--- a/meta-openembedded/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Task for an image with Xserver"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r9"
-
-inherit task
-
-# for backwards compatibility
-RPROVIDES_${PN} += "task-xserver"
-
-XSERVER ?= "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard \
-"
-
-
-RDEPENDS_${PN} = " \
-  ${XSERVER} \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/meta-openembedded/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-openembedded/meta-oe/recipes-core/tasks/task-x11_1.0.bb
deleted file mode 100644 (file)
index 326e09f..0000000
--- a/meta-openembedded/meta-oe/recipes-core/tasks/task-x11_1.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer."
-SECTION = "x11/server"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r11"
-
-inherit task allarch
-
-PACKAGES += "${PN}-utils"
-
-RRECOMMENDS_${PN} = "\
-  ${PN}-server \
-  ${PN}-utils \
-"
-
-# xserver-common, x11-common
-VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
-
-# elsa or xserver-nodm-init(-systemd)
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
-
-RDEPENDS_${PN}-utils = "\
-  ${VIRTUAL-RUNTIME_xserver_common} \
-  ${VIRTUAL-RUNTIME_graphical_init_manager} \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-"
-