sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

packagegroup-core-x11: split machine specific parts to separate recipe packagegroup-core-x11-server 

* add new packagegroup-core-x11-server to SIGGEN_EXCLUDERECIPES_ABISAFE,
  so that recipes depending on it are not rebuilt after every machine
  swtich
* allows to remove task-x11-server and task-x11 from meta-oe without
  loosing any functionality
* be carefull with default XSERVER value which does not have
  xf86-input-mouse and xf86-input-keyboard)
* VIRTUAL-RUNTIME_xserver_common which defaults to x11-common in oe-core
  and xserver-common in meta-oe's task-x11

(From OE-Core rev: a398c96706c119f298f57a929a317fcf8e0f5b92)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2012-09-04 22:58:37 +02:00 committed by Richard Purdie
parent 6554dbf956
commit 1d4861923d
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/layer.conf
View File

@ -24,4 +24,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
base-files \
keymaps \
udev-extraconf \
packagegroup-x11-xserver \
"

24
meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb Normal file
View File

@ -0,0 +1,24 @@
#
# Copyright (C) 2011 Intel Corporation
#
LICENSE = "MIT"
PR = "r38"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "${PN}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
SUMMARY_${PN} = "X11 display server"
RDEPENDS_${PN} = "\
${XSERVER} \
"
# Allow replacing task-x11-server in meta-oe
RPROVIDES_${PN} = "task-x11-server task-xserver"
RREPLACES_${PN} = "task-x11-server task-xserver"
RCONFLICTS_${PN} = "task-x11-server task-xserver"

16
meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
View File

@ -3,15 +3,11 @@
#
LICENSE = "MIT"
PR = "r37"
PR = "r38"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "${PN} ${PN}-xserver ${PN}-utils"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
PACKAGES = "${PN} ${PN}-utils"
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@ -25,11 +21,6 @@ RDEPENDS_${PN} = "\
${PN}-utils \
"
SUMMARY_${PN}-xserver = "X11 display server"
RDEPENDS_${PN}-xserver = "\
${XSERVER} \
"
SUMMARY_${PN}-utils = "X11 basic utilities and init"
RDEPENDS_${PN}-utils = "\
${VIRTUAL-RUNTIME_xserver_common} \
@ -44,9 +35,6 @@ RDEPENDS_${PN}-utils = "\
RPROVIDES_${PN} = "task-x11"
RREPLACES_${PN} = "task-x11"
RCONFLICTS_${PN} = "task-x11"
RPROVIDES_${PN}-xserver = "task-x11-server task-xserver"
RREPLACES_${PN}-xserver = "task-x11-server"
RCONFLICTS_${PN}-xserver = "task-x11-server"
RPROVIDES_${PN}-utils = "task-x11-utils"
RREPLACES_${PN}-utils = "task-x11-utils"
RCONFLICTS_${PN}-utils = "task-x11-utils"