diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-04 18:24:48 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-09-06 13:13:59 +0200 |
commit | ba89801d4dc6b7c79d2f0e333e424d14a64c786a (patch) | |
tree | 83bd48b047155ed16df5f7323d825d17e48f85d5 /meta-oe | |
parent | 49e269ecc66adda341922cbd86167bbfa97c54ca (diff) | |
download | meta-openembedded-contrib-ba89801d4dc6b7c79d2f0e333e424d14a64c786a.tar.gz |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/conf/layer.conf | 1 | ||||
-rw-r--r-- | meta-oe/recipes-core/tasks/task-x11-server_1.0.bb | 23 | ||||
-rw-r--r-- | meta-oe/recipes-core/tasks/task-x11_1.0.bb | 30 |
3 files changed, 0 insertions, 54 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index dcacb32cf9..abb8d47c6b 100644 --- a/meta-oe/conf/layer.conf +++ b/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-oe/recipes-core/tasks/task-x11-server_1.0.bb b/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb deleted file mode 100644 index 7e43d5507b..0000000000 --- a/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-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb deleted file mode 100644 index 326e09f31e..0000000000 --- a/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 \ -" - |