--- /dev/null
+#
+# 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"
#
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"
${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} \
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"