From patchwork Wed Sep  5 09:22:32 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [meta-oe] task-x11*: Rename to packagegroup to match oe-core.
Date: Wed, 05 Sep 2012 09:22:32 -0000
From: Martin Ertsaas <mertsas@cisco.com>
X-Patchwork-Id: 35905
Message-Id: <1346836952-1804-1-git-send-email-mertsas@cisco.com>
To: openembedded-devel@lists.openembedded.org

---
 .../packagegroups/packagegroup-x11-server_1.0.bb   |   23 +++++++++++++++
 .../packagegroups/packagegroup-x11_1.0.bb          |   30 ++++++++++++++++++++
 meta-oe/recipes-core/tasks/task-x11-server_1.0.bb  |   23 ---------------
 meta-oe/recipes-core/tasks/task-x11_1.0.bb         |   30 --------------------
 4 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
 create mode 100644 meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
 delete mode 100644 meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
 delete mode 100644 meta-oe/recipes-core/tasks/task-x11_1.0.bb


diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
new file mode 100644
index 0000000..7e43d55
--- /dev/null
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Task for an image with Xserver"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PR = "r9"
+
+inherit task
+
+# for backwards compatibility
+RPROVIDES_${PN} += "task-xserver"
+
+XSERVER ?= "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard \
+"
+
+
+RDEPENDS_${PN} = " \
+  ${XSERVER} \
+"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
new file mode 100644
index 0000000..326e09f
--- /dev/null
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer."
+SECTION = "x11/server"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r11"
+
+inherit task allarch
+
+PACKAGES += "${PN}-utils"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-server \
+  ${PN}-utils \
+"
+
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
+
+# elsa or xserver-nodm-init(-systemd)
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+
+RDEPENDS_${PN}-utils = "\
+  ${VIRTUAL-RUNTIME_xserver_common} \
+  ${VIRTUAL-RUNTIME_graphical_init_manager} \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+"
+
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 7e43d55..0000000
--- a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Task for an image with Xserver"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r9"
-
-inherit task
-
-# for backwards compatibility
-RPROVIDES_${PN} += "task-xserver"
-
-XSERVER ?= "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard \
-"
-
-
-RDEPENDS_${PN} = " \
-  ${XSERVER} \
-"
-
-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 326e09f..0000000
--- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer."
-SECTION = "x11/server"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r11"
-
-inherit task allarch
-
-PACKAGES += "${PN}-utils"
-
-RRECOMMENDS_${PN} = "\
-  ${PN}-server \
-  ${PN}-utils \
-"
-
-# xserver-common, x11-common
-VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
-
-# elsa or xserver-nodm-init(-systemd)
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
-
-RDEPENDS_${PN}-utils = "\
-  ${VIRTUAL-RUNTIME_xserver_common} \
-  ${VIRTUAL-RUNTIME_graphical_init_manager} \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-"
-