[meta-oe][meta-efl][PATCH 0/2] Drop task-x11*

[meta-oe][meta-efl][PATCH 0/2] Drop task-x11*

[Martin Jansa]

The following changes since commit 49e269ecc66adda341922cbd86167bbfa97c54ca:

  packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path (2012-09-05 10:05:06 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (2):
  task-x11*: remove in favor of packagegroup-core-x11* variants from
    oe-core
  task-x11-illume: rename to packagegroup-x11-illume

 .../packagegroup-x11-illume.bb}                    | 11 +++++---
 meta-oe/conf/layer.conf                            |  1 -
 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, 7 insertions(+), 58 deletions(-)
 rename meta-efl/recipes-efl/{tasks/task-x11-illume.bb => packagegroups/packagegroup-x11-illume.bb} (67%)
 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

-- 
1.7.12

[meta-oe][meta-efl][PATCH 1/2] task-x11*: remove in favor of packagegroup-core-x11* variants from oe-core

[Martin Jansa]

* packagegroup-core-x11* allows to remove task-x11-server and
  task-x11 from meta-oe without loosing any functionality
* be carefull with 2 changed default values:
  XSERVER does not include xf86-input-mouse and xf86-input-keyboard
  VIRTUAL-RUNTIME_xserver_common defaults to x11-common in oe-core
  and to xserver-common in meta-oe's task-x11

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/conf/layer.conf                           |  1 -
 meta-oe/recipes-core/tasks/task-x11-server_1.0.bb | 23 -----------------
 meta-oe/recipes-core/tasks/task-x11_1.0.bb        | 30 -----------------------
 3 files changed, 54 deletions(-)
 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/conf/layer.conf b/meta-oe/conf/layer.conf
index dcacb32..abb8d47 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -26,7 +26,6 @@ BBFILE_PRIORITY_openembedded-layer = "6"
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal-xinput \
   mplayer-common \
-  task-x11-server \
   fbset-modes \
   gpsd-machine-conf \
 "
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 \
-"
-
-- 
1.7.12

[meta-oe][meta-efl][PATCH 2/2] task-x11-illume: rename to packagegroup-x11-illume

[Martin Jansa]

* add RPROVIDES/RREPLACES/RCONFLICTS task-x11-illume for upgrade path
* RDEPEND on packagegroup-core-x11* from oe-core now with task-x11-*
  gone from meta-oe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../packagegroup-x11-illume.bb}                               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 rename meta-efl/recipes-efl/{tasks/task-x11-illume.bb => packagegroups/packagegroup-x11-illume.bb} (67%)

diff --git a/meta-efl/recipes-efl/tasks/task-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
similarity index 67%
rename from meta-efl/recipes-efl/tasks/task-x11-illume.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
index eb628b7..11b01f6 100644
--- a/meta-efl/recipes-efl/tasks/task-x11-illume.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
@@ -3,17 +3,20 @@ SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-openembedded/meta-efl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
-PR = "r3"
+PR = "r5"
 
-inherit task allarch
+inherit packagegroup allarch
 
 # Default theme and config
 ETHEME ?= "e-wm-theme-default"
 ECONFIG ?= "e-wm-config-mobile"
 
+RPROVIDES_${PN} += "task-x11-illume"
+RREPLACES_${PN} += "task-x11-illume"
+RCONFLICTS_${PN} += "task-x11-illume"
 RDEPENDS_${PN} = "\
-  task-x11-server \
-  task-x11-utils \
+  packagegroup-core-x11-xserver \
+  packagegroup-core-x11-utils \
   \
   e-wm \
   ${ECONFIG} \
-- 
1.7.12