diff options
| -rw-r--r-- | meta/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 24 | ||||
| -rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 16 |
3 files changed, 27 insertions, 14 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index dfcb1f35b1..ed50f1c509 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -24,4 +24,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ base-files \ keymaps \ udev-extraconf \ + packagegroup-x11-xserver \ " 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 0000000000..bf39e6316b --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -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" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index e306c08ce2..e89df3aaab 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -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" |