summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-09-04 20:58:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 16:37:15 (GMT)
commit1d4861923db9674ff5b83fcd0755423bb1ccfd22 (patch)
tree30d0b7823718ad085f910d7f14ef49cd3a4b6854
parent6554dbf95655c63c9fc8bdfbc67d93b6054bc441 (diff)
downloadpoky-1d4861923db9674ff5b83fcd0755423bb1ccfd22.tar.gz
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>
-rw-r--r--meta/conf/layer.conf1
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb24
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb16
3 files changed, 27 insertions, 14 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index dfcb1f3..ed50f1c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -24,4 +24,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
24 base-files \ 24 base-files \
25 keymaps \ 25 keymaps \
26 udev-extraconf \ 26 udev-extraconf \
27 packagegroup-x11-xserver \
27" 28"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
new file mode 100644
index 0000000..bf39e63
--- /dev/null
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
@@ -0,0 +1,24 @@
1#
2# Copyright (C) 2011 Intel Corporation
3#
4
5LICENSE = "MIT"
6PR = "r38"
7
8inherit packagegroup
9
10PACKAGE_ARCH = "${MACHINE_ARCH}"
11
12PACKAGES = "${PN}"
13
14XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
15
16SUMMARY_${PN} = "X11 display server"
17RDEPENDS_${PN} = "\
18 ${XSERVER} \
19 "
20
21# Allow replacing task-x11-server in meta-oe
22RPROVIDES_${PN} = "task-x11-server task-xserver"
23RREPLACES_${PN} = "task-x11-server task-xserver"
24RCONFLICTS_${PN} = "task-x11-server task-xserver"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index e306c08..e89df3a 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -3,15 +3,11 @@
3# 3#
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6PR = "r37" 6PR = "r38"
7 7
8inherit packagegroup 8inherit packagegroup
9 9
10PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGES = "${PN} ${PN}-utils"
11
12PACKAGES = "${PN} ${PN}-xserver ${PN}-utils"
13
14XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
15 11
16# xserver-common, x11-common 12# xserver-common, x11-common
17VIRTUAL-RUNTIME_xserver_common ?= "x11-common" 13VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@@ -25,11 +21,6 @@ RDEPENDS_${PN} = "\
25 ${PN}-utils \ 21 ${PN}-utils \
26 " 22 "
27 23
28SUMMARY_${PN}-xserver = "X11 display server"
29RDEPENDS_${PN}-xserver = "\
30 ${XSERVER} \
31 "
32
33SUMMARY_${PN}-utils = "X11 basic utilities and init" 24SUMMARY_${PN}-utils = "X11 basic utilities and init"
34RDEPENDS_${PN}-utils = "\ 25RDEPENDS_${PN}-utils = "\
35 ${VIRTUAL-RUNTIME_xserver_common} \ 26 ${VIRTUAL-RUNTIME_xserver_common} \
@@ -44,9 +35,6 @@ RDEPENDS_${PN}-utils = "\
44RPROVIDES_${PN} = "task-x11" 35RPROVIDES_${PN} = "task-x11"
45RREPLACES_${PN} = "task-x11" 36RREPLACES_${PN} = "task-x11"
46RCONFLICTS_${PN} = "task-x11" 37RCONFLICTS_${PN} = "task-x11"
47RPROVIDES_${PN}-xserver = "task-x11-server task-xserver"
48RREPLACES_${PN}-xserver = "task-x11-server"
49RCONFLICTS_${PN}-xserver = "task-x11-server"
50RPROVIDES_${PN}-utils = "task-x11-utils" 38RPROVIDES_${PN}-utils = "task-x11-utils"
51RREPLACES_${PN}-utils = "task-x11-utils" 39RREPLACES_${PN}-utils = "task-x11-utils"
52RCONFLICTS_${PN}-utils = "task-x11-utils" 40RCONFLICTS_${PN}-utils = "task-x11-utils"