diff options
| -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" | |||
| 26 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 26 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
| 27 | pointercal-xinput \ | 27 | pointercal-xinput \ |
| 28 | mplayer-common \ | 28 | mplayer-common \ |
| 29 | task-x11-server \ | ||
| 30 | fbset-modes \ | 29 | fbset-modes \ |
| 31 | gpsd-machine-conf \ | 30 | gpsd-machine-conf \ |
| 32 | " | 31 | " |
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 @@ | |||
| 1 | DESCRIPTION = "Task for an image with Xserver" | ||
| 2 | LICENSE = "MIT" | ||
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | ||
| 4 | PR = "r9" | ||
| 5 | |||
| 6 | inherit task | ||
| 7 | |||
| 8 | # for backwards compatibility | ||
| 9 | RPROVIDES_${PN} += "task-xserver" | ||
| 10 | |||
| 11 | XSERVER ?= "xserver-xorg \ | ||
| 12 | xf86-input-evdev \ | ||
| 13 | xf86-input-mouse \ | ||
| 14 | xf86-video-fbdev \ | ||
| 15 | xf86-input-keyboard \ | ||
| 16 | " | ||
| 17 | |||
| 18 | |||
| 19 | RDEPENDS_${PN} = " \ | ||
| 20 | ${XSERVER} \ | ||
| 21 | " | ||
| 22 | |||
| 23 | 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 @@ | |||
| 1 | DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer." | ||
| 2 | SECTION = "x11/server" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
| 5 | PR = "r11" | ||
| 6 | |||
| 7 | inherit task allarch | ||
| 8 | |||
| 9 | PACKAGES += "${PN}-utils" | ||
| 10 | |||
| 11 | RRECOMMENDS_${PN} = "\ | ||
| 12 | ${PN}-server \ | ||
| 13 | ${PN}-utils \ | ||
| 14 | " | ||
| 15 | |||
| 16 | # xserver-common, x11-common | ||
| 17 | VIRTUAL-RUNTIME_xserver_common ?= "xserver-common" | ||
| 18 | |||
| 19 | # elsa or xserver-nodm-init(-systemd) | ||
| 20 | VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" | ||
| 21 | |||
| 22 | RDEPENDS_${PN}-utils = "\ | ||
| 23 | ${VIRTUAL-RUNTIME_xserver_common} \ | ||
| 24 | ${VIRTUAL-RUNTIME_graphical_init_manager} \ | ||
| 25 | xauth \ | ||
| 26 | xhost \ | ||
| 27 | xset \ | ||
| 28 | xrandr \ | ||
| 29 | " | ||
| 30 | |||
