[meta-oe][meta-efl][PATCH 00/10] EFL upgrade to 1.7.0 and fix parse after task->packagegroup change in oe-core

[meta-oe][meta-efl][PATCH 00/10] EFL upgrade to 1.7.0 and fix parse after task->packagegroup change in oe-core

[Martin Jansa]

Changes needed to remove task-x11 and task-x11-server 
are in separate branch jansa/packagegroup.

So this one can be merged as is and I'll send request 
for jansa/packagegroup when oe-core versions are ready.

The following changes since commit a81cdc840c1dfca2bd0cb4ddd6e4bc1488286649:

  gtk-xfce-engine: fix staticdev warning (2012-08-31 09:06:17 +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 (10):
  e-base: bump EFL_SRCREV to 1.7.0 release and update PV in svn recipes
  terminology: add version 0.1.0, negative D_P to svn and bump PE
  recipes-efl: upgrade from 1.7.0-beta to 1.7.0
  e-wm: update RRECOMMENDS_-config-mobile
  task-x11-illume: update default ECONFIG
  python-efl: upgrade svn recipes to 1.7.0+svn
  python-efl: upgrade recipes to 1.7.0
  xf86-video-glamo: add xserver-xorg-module-exa to RDEPENDS
  task*: rename to packagegroup to match oe-core
  packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get
    some upgrade path

 meta-efl/classes/e-base.bbclass                    |  2 +-
 .../conf/distro/include/efl-from-svn-recipes.inc   |  4 +++-
 meta-efl/recipes-core/meta/meta-toolchain-efl.bb   |  2 +-
 .../python/python-ecore_1.6.99-beta.bb             |  6 ------
 .../recipes-devtools/python/python-ecore_1.7.0.bb  |  5 +++++
 .../recipes-devtools/python/python-ecore_svn.bb    |  2 +-
 .../python/python-edbus_1.6.99-beta.bb             |  6 ------
 .../recipes-devtools/python/python-edbus_1.7.0.bb  |  5 +++++
 .../recipes-devtools/python/python-edbus_svn.bb    |  2 +-
 .../python/python-edje_1.6.99-beta.bb              |  7 -------
 .../recipes-devtools/python/python-edje_1.7.0.bb   |  6 ++++++
 .../recipes-devtools/python/python-edje_svn.bb     |  2 +-
 .../python/python-elementary_1.6.99-beta.bb        |  6 ------
 .../python/python-elementary_1.7.0.bb              |  5 +++++
 .../python/python-elementary_svn.bb                |  2 +-
 .../python/python-emotion_1.6.99-beta.bb           |  6 ------
 .../python/python-emotion_1.7.0.bb                 |  5 +++++
 .../recipes-devtools/python/python-emotion_svn.bb  |  2 +-
 .../python/python-evas_1.6.99-beta.bb              |  6 ------
 .../recipes-devtools/python/python-evas_1.7.0.bb   |  5 +++++
 .../recipes-devtools/python/python-evas_svn.bb     |  2 +-
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |  4 ++--
 meta-efl/recipes-efl/e17/terminology.inc           | 23 +++++++++++++++++++++
 meta-efl/recipes-efl/e17/terminology_0.1.0.bb      | 10 +++++++++
 meta-efl/recipes-efl/e17/terminology_svn.bb        | 22 +++-----------------
 .../efl/{ecore_1.6.99-beta.bb => ecore_1.7.0.bb}   |  6 ++----
 meta-efl/recipes-efl/efl/ecore_svn.bb              |  2 +-
 meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb      | 12 -----------
 meta-efl/recipes-efl/efl/edbus_1.7.0.bb            | 10 +++++++++
 meta-efl/recipes-efl/efl/edbus_svn.bb              |  2 +-
 meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb       | 12 -----------
 meta-efl/recipes-efl/efl/edje_1.7.0.bb             | 10 +++++++++
 meta-efl/recipes-efl/efl/edje_svn.bb               |  2 +-
 meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb        | 12 -----------
 meta-efl/recipes-efl/efl/eet_1.7.0.bb              | 10 +++++++++
 meta-efl/recipes-efl/efl/eet_svn.bb                |  2 +-
 meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb       | 12 -----------
 meta-efl/recipes-efl/efl/eeze_1.7.0.bb             | 10 +++++++++
 meta-efl/recipes-efl/efl/eeze_svn.bb               |  2 +-
 meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb     | 12 -----------
 meta-efl/recipes-efl/efl/efreet_1.7.0.bb           | 10 +++++++++
 meta-efl/recipes-efl/efl/efreet_svn.bb             |  2 +-
 meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb       | 12 -----------
 meta-efl/recipes-efl/efl/eina_1.7.0.bb             | 10 +++++++++
 meta-efl/recipes-efl/efl/eina_svn.bb               |  2 +-
 meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb        | 12 -----------
 meta-efl/recipes-efl/efl/eio_1.7.0.bb              | 10 +++++++++
 meta-efl/recipes-efl/efl/eio_svn.bb                |  2 +-
 meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb | 12 -----------
 meta-efl/recipes-efl/efl/elementary_1.7.0.bb       | 10 +++++++++
 meta-efl/recipes-efl/efl/elementary_svn.bb         |  2 +-
 meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb     | 12 -----------
 meta-efl/recipes-efl/efl/embryo_1.7.0.bb           | 10 +++++++++
 meta-efl/recipes-efl/efl/embryo_svn.bb             |  2 +-
 meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb    | 12 -----------
 meta-efl/recipes-efl/efl/emotion_1.7.0.bb          | 10 +++++++++
 meta-efl/recipes-efl/efl/emotion_svn.bb            |  2 +-
 meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb     | 12 -----------
 meta-efl/recipes-efl/efl/ethumb_1.7.0.bb           | 10 +++++++++
 meta-efl/recipes-efl/efl/ethumb_svn.bb             |  3 +--
 .../efl/evas-generic-loaders_1.6.99-beta.bb        | 12 -----------
 .../recipes-efl/efl/evas-generic-loaders_1.7.0.bb  | 10 +++++++++
 .../recipes-efl/efl/evas-generic-loaders_svn.bb    |  2 +-
 meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb       | 12 -----------
 meta-efl/recipes-efl/efl/evas_1.7.0.bb             | 10 +++++++++
 meta-efl/recipes-efl/efl/evas_svn.bb               |  2 +-
 meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb   | 12 -----------
 meta-efl/recipes-efl/efl/expedite_1.7.0.bb         | 10 +++++++++
 meta-efl/recipes-efl/efl/expedite_svn.bb           |  2 +-
 .../packagegroup-efl-sdk.bb}                       |  9 ++++++--
 .../packagegroup-efl-sdk.inc}                      |  0
 .../packagegroup-efl-standalone-sdk-target.bb}     |  9 ++++++--
 meta-efl/recipes-efl/tasks/task-x11-illume.bb      |  6 ++----
 .../packagegroup-basic.bb}                         | 11 ++++++----
 .../packagegroup-boot.bb}                          |  8 ++++++--
 .../packagegroup-cli-tools.bb}                     | 11 ++++++++--
 .../packagegroup-sdk-target.bb}                    |  8 ++++++--
 .../packagegroup-fonts-truetype.bb}                | 24 ++++++++++++++++------
 .../xorg-driver/xf86-video-glamo_git.bb            |  3 ++-
 .../packagegroup-qte-toolchain-target.bbappend}    |  0
 .../packagegroup-basic.bbappend}                   |  0
 .../packagegroup-xfce-base.bb}                     |  8 ++++++--
 .../packagegroup-xfce-extended.bb}                 | 10 ++++++---
 83 files changed, 314 insertions(+), 285 deletions(-)
 delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
 create mode 100644 meta-efl/recipes-efl/e17/terminology.inc
 create mode 100644 meta-efl/recipes-efl/e17/terminology_0.1.0.bb
 rename meta-efl/recipes-efl/efl/{ecore_1.6.99-beta.bb => ecore_1.7.0.bb} (46%)
 delete mode 100644 meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/edbus_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/edje_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eet_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eeze_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eina_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eio_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.0.bb
 rename meta-efl/recipes-efl/{tasks/task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} (65%)
 rename meta-efl/recipes-efl/{tasks/task-efl-sdk.inc => packagegroups/packagegroup-efl-sdk.inc} (100%)
 rename meta-efl/recipes-efl/{tasks/task-efl-standalone-sdk-target.bb => packagegroups/packagegroup-efl-standalone-sdk-target.bb} (58%)
 rename meta-oe/recipes-core/{tasks/task-basic.bb => packagegroups/packagegroup-basic.bb} (84%)
 rename meta-oe/recipes-core/{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} (86%)
 rename meta-oe/recipes-core/{tasks/task-cli-tools.bb => packagegroups/packagegroup-cli-tools.bb} (72%)
 rename meta-oe/recipes-devtools/{tasks/task-sdk-target.bb => packagegroups/packagegroup-sdk-target.bb} (73%)
 rename meta-oe/recipes-graphics/{tasks/task-fonts-truetype.bb => packagegroups/packagegroup-fonts-truetype.bb} (42%)
 rename meta-oe/recipes-qt/{tasks/task-qte-toolchain-target.bbappend => packagegroups/packagegroup-qte-toolchain-target.bbappend} (100%)
 rename meta-systemd/meta-oe/recipes-core/{tasks/task-basic.bbappend => packagegroups/packagegroup-basic.bbappend} (100%)
 rename meta-xfce/recipes-xfce/{tasks/task-xfce-base.bb => packagegroups/packagegroup-xfce-base.bb} (85%)
 rename meta-xfce/recipes-xfce/{tasks/task-xfce-extended.bb => packagegroups/packagegroup-xfce-extended.bb} (84%)

-- 
1.7.12

[meta-oe][meta-efl][PATCH 01/10] e-base: bump EFL_SRCREV to 1.7.0 release and update PV in svn recipes

[Martin Jansa]

* python bindings tarball are not released yet

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/e-base.bbclass                       |  2 +-
 meta-efl/conf/distro/include/efl-from-svn-recipes.inc | 15 ++++++++-------
 meta-efl/recipes-efl/efl/ecore_svn.bb                 |  2 +-
 meta-efl/recipes-efl/efl/edbus_svn.bb                 |  2 +-
 meta-efl/recipes-efl/efl/edje_svn.bb                  |  2 +-
 meta-efl/recipes-efl/efl/eet_svn.bb                   |  2 +-
 meta-efl/recipes-efl/efl/eeze_svn.bb                  |  2 +-
 meta-efl/recipes-efl/efl/efreet_svn.bb                |  2 +-
 meta-efl/recipes-efl/efl/eina_svn.bb                  |  2 +-
 meta-efl/recipes-efl/efl/eio_svn.bb                   |  2 +-
 meta-efl/recipes-efl/efl/elementary_svn.bb            |  2 +-
 meta-efl/recipes-efl/efl/embryo_svn.bb                |  2 +-
 meta-efl/recipes-efl/efl/emotion_svn.bb               |  2 +-
 meta-efl/recipes-efl/efl/ethumb_svn.bb                |  3 +--
 meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb  |  2 +-
 meta-efl/recipes-efl/efl/evas_svn.bb                  |  2 +-
 meta-efl/recipes-efl/efl/expedite_svn.bb              |  2 +-
 17 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index e701fb5..98aac41 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "75359"
+EFL_SRCREV ?= "75861"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
index 4625b19..b017645 100644
--- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
+++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
@@ -1,4 +1,4 @@
-EFL_PREFERRED_VERSION ?= "1.6.99+svn%"
+EFL_PREFERRED_VERSION ?= "1.7.0+svn%"
 
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"
@@ -30,9 +30,10 @@ PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}"
 
-PREFERRED_VERSION_python-elementary ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-ecore ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-edbus ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-edje ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-emotion ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-evas ?= "${EFL_PREFERRED_VERSION}"
+EFL_PYTHON_PREFERRED_VERSION ?= "1.6.99+svn%"
+PREFERRED_VERSION_python-elementary ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-ecore ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edbus ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edje ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-emotion ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-evas ?= "${EFL_PYTHON_PREFERRED_VERSION}"
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
index e00a0cc..4e2cdec 100644
--- a/meta-efl/recipes-efl/efl/ecore_svn.bb
+++ b/meta-efl/recipes-efl/efl/ecore_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/edbus_svn.bb
+++ b/meta-efl/recipes-efl/efl/edbus_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/edje_svn.bb
+++ b/meta-efl/recipes-efl/efl/edje_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/eet_svn.bb
+++ b/meta-efl/recipes-efl/efl/eet_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/eeze_svn.bb
+++ b/meta-efl/recipes-efl/efl/eeze_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/efreet_svn.bb
+++ b/meta-efl/recipes-efl/efl/efreet_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/eina_svn.bb
+++ b/meta-efl/recipes-efl/efl/eina_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/eio_svn.bb
+++ b/meta-efl/recipes-efl/efl/eio_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/embryo_svn.bb
+++ b/meta-efl/recipes-efl/efl/embryo_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/emotion_svn.bb
+++ b/meta-efl/recipes-efl/efl/emotion_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb
index 892b298..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/ethumb_svn.bb
+++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
@@ -9,4 +9,3 @@ SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
-
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/evas_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/expedite_svn.bb b/meta-efl/recipes-efl/efl/expedite_svn.bb
index 06cf950..d8fd5d6 100644
--- a/meta-efl/recipes-efl/efl/expedite_svn.bb
+++ b/meta-efl/recipes-efl/efl/expedite_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-- 
1.7.12

[meta-oe][meta-efl][PATCH 02/10] terminology: add version 0.1.0, negative D_P to svn and bump PE

[Martin Jansa]

* PE bump is needed for upgrade path from svn recipe to 0.1.0 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../conf/distro/include/efl-from-svn-recipes.inc   |  2 ++
 meta-efl/recipes-efl/e17/terminology.inc           | 23 ++++++++++++++++++++++
 meta-efl/recipes-efl/e17/terminology_0.1.0.bb      | 10 ++++++++++
 meta-efl/recipes-efl/e17/terminology_svn.bb        | 22 +++------------------
 4 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/terminology.inc
 create mode 100644 meta-efl/recipes-efl/e17/terminology_0.1.0.bb

diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
index b017645..c28e281 100644
--- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
+++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
@@ -37,3 +37,5 @@ PREFERRED_VERSION_python-edbus ?= "${EFL_PYTHON_PREFERRED_VERSION}"
 PREFERRED_VERSION_python-edje ?= "${EFL_PYTHON_PREFERRED_VERSION}"
 PREFERRED_VERSION_python-emotion ?= "${EFL_PYTHON_PREFERRED_VERSION}"
 PREFERRED_VERSION_python-evas ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+
+PREFERRED_VERSION_terminology ?= "0.1.0+svn%"
diff --git a/meta-efl/recipes-efl/e17/terminology.inc b/meta-efl/recipes-efl/e17/terminology.inc
new file mode 100644
index 0000000..15af6ea
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/terminology.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Enlightenment Terminal Emulator"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
+DEPENDS = "evas ecore edje elementary eina eet emotion"
+
+inherit e gettext
+INC_PR = "r2"
+
+# Because latest release we have is 0.1.0 which sorts lower then 0.1.0+svnr${SRCPV} already in feeds
+PE = "2"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
+
+FILES_${PN} += "\
+        ${datadir}/icons/terminology.png \
+"
+
+# doesn't start without own theme
+# ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error
+# CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'?
+RDEPENDS_${PN} += "${PN}-themes"
diff --git a/meta-efl/recipes-efl/e17/terminology_0.1.0.bb b/meta-efl/recipes-efl/e17/terminology_0.1.0.bb
new file mode 100644
index 0000000..7a04069
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/terminology_0.1.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "30867692e44799cd9bbe6562d69ae62d"
+SRC_URI[sha256sum] = "87f32089b2731c3e9a72b5bde92695eb91097fa79dbb70388774c9dcb5442ebb"
diff --git a/meta-efl/recipes-efl/e17/terminology_svn.bb b/meta-efl/recipes-efl/e17/terminology_svn.bb
index 48d229b..9fa1304 100644
--- a/meta-efl/recipes-efl/e17/terminology_svn.bb
+++ b/meta-efl/recipes-efl/e17/terminology_svn.bb
@@ -1,25 +1,9 @@
-DESCRIPTION = "Enlightenment Terminal Emulator"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
-DEPENDS = "evas ecore edje elementary eina eet emotion"
+require ${BPN}.inc
 
+DEFAULT_PREFERENCE = "-1"
 PV = "0.1.0+svnr${SRCPV}"
-PR = "r1"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 
-inherit e gettext
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
-
-EXTRA_OECONF = "\
-  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-"
-
-FILES_${PN} += "\
-        ${datadir}/icons/terminology.png \
-"
-
-# doesn't start without own theme
-# ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error
-# CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'?
-RDEPENDS_${PN} += "${PN}-themes"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 03/10] recipes-efl: upgrade from 1.7.0-beta to 1.7.0

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-efl/efl/{ecore_1.6.99-beta.bb => ecore_1.7.0.bb} |  6 ++----
 meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb                | 12 ------------
 meta-efl/recipes-efl/efl/edbus_1.7.0.bb                      | 10 ++++++++++
 meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb                 | 12 ------------
 meta-efl/recipes-efl/efl/edje_1.7.0.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb                  | 12 ------------
 meta-efl/recipes-efl/efl/eet_1.7.0.bb                        | 10 ++++++++++
 meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb                 | 12 ------------
 meta-efl/recipes-efl/efl/eeze_1.7.0.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb               | 12 ------------
 meta-efl/recipes-efl/efl/efreet_1.7.0.bb                     | 10 ++++++++++
 meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb                 | 12 ------------
 meta-efl/recipes-efl/efl/eina_1.7.0.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb                  | 12 ------------
 meta-efl/recipes-efl/efl/eio_1.7.0.bb                        | 10 ++++++++++
 meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb           | 12 ------------
 meta-efl/recipes-efl/efl/elementary_1.7.0.bb                 | 10 ++++++++++
 meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb               | 12 ------------
 meta-efl/recipes-efl/efl/embryo_1.7.0.bb                     | 10 ++++++++++
 meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb              | 12 ------------
 meta-efl/recipes-efl/efl/emotion_1.7.0.bb                    | 10 ++++++++++
 meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb               | 12 ------------
 meta-efl/recipes-efl/efl/ethumb_1.7.0.bb                     | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb | 12 ------------
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb       | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb                 | 12 ------------
 meta-efl/recipes-efl/efl/evas_1.7.0.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb             | 12 ------------
 meta-efl/recipes-efl/efl/expedite_1.7.0.bb                   | 10 ++++++++++
 29 files changed, 142 insertions(+), 172 deletions(-)
 rename meta-efl/recipes-efl/efl/{ecore_1.6.99-beta.bb => ecore_1.7.0.bb} (46%)
 delete mode 100644 meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/edbus_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/edje_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eet_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eeze_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eina_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/eio_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas_1.7.0.bb
 delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.0.bb

diff --git a/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ecore_1.7.0.bb
similarity index 46%
rename from meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb
rename to meta-efl/recipes-efl/efl/ecore_1.7.0.bb
index 084b008..173c3c3 100644
--- a/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb
+++ b/meta-efl/recipes-efl/efl/ecore_1.7.0.bb
@@ -2,12 +2,10 @@ require ${BPN}.inc
 
 PR = "${INC_PR}.0"
 
-SRCVER = "1.7.0-beta"
-
 SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
   file://fix-ecore-fb-initialization.patch \
 "
 
-SRC_URI[md5sum] = "12360540b2b8d46022cbf228c3bdef07"
-SRC_URI[sha256sum] = "e3683d4b9be01347c564065bed36a77c6f42db56be7ea3cb6029a3b532afa1cb"
+SRC_URI[md5sum] = "cf0b5e980a77dc0d1bdedf2bcc60e862"
+SRC_URI[sha256sum] = "f009e17376b7f3fb6ce6b45648d2a0131a152943b502fa34cc4bd018f67da8bb"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
deleted file mode 100644
index c070549..0000000
--- a/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "542a8931b85675e497df0c290103ca87"
-SRC_URI[sha256sum] = "e63fe9c67d3ec5b6bed06a4c49f70fbb93e30481f36f35ca2ee9810cbaf85868"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.0.bb b/meta-efl/recipes-efl/efl/edbus_1.7.0.bb
new file mode 100644
index 0000000..bc24e2f
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edbus_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "3d59bfb00763a61976a976be925e1cbf"
+SRC_URI[sha256sum] = "6ee303bd0e2f91a6be08433df474377494ba6815441e5e6b79a5d284ead2a768"
diff --git a/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
deleted file mode 100644
index eaccde9..0000000
--- a/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "07c1bdb6766391fa972e2f1a4c480413"
-SRC_URI[sha256sum] = "7bbad4db88e82a6e0206942c859d4bbbba261cbaa4530f343664538456eef7c9"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.0.bb b/meta-efl/recipes-efl/efl/edje_1.7.0.bb
new file mode 100644
index 0000000..8eb59e4
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edje_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "37e15c5d6e7c2676728bda75109b2218"
+SRC_URI[sha256sum] = "d6df9a7bf11c4605f55a2e7c209210044f8dc4f3332135f6256676d2f937621b"
diff --git a/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
deleted file mode 100644
index 7c5a655..0000000
--- a/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "1103a2a0e5022c42dcb4ccacc5db8881"
-SRC_URI[sha256sum] = "156aa6ef6880cf45b25c6cb45bf659ebb2e9bb207c11a479f504cd795c030c6b"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.0.bb b/meta-efl/recipes-efl/efl/eet_1.7.0.bb
new file mode 100644
index 0000000..f617090
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eet_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "46e989eb4dddd942b4564299e19d9f64"
+SRC_URI[sha256sum] = "9bca5becaaa5abf4b7ac0f80de68d3b9a8f1abce7eca4175e1ad82953783d209"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
deleted file mode 100644
index 446503e..0000000
--- a/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "b557e2e6c5988abf0695474b5763520b"
-SRC_URI[sha256sum] = "b9c1262bc8e45b83c7b3643f9aefcebc88518953e4d4967ca655f1b325aac6ea"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.0.bb b/meta-efl/recipes-efl/efl/eeze_1.7.0.bb
new file mode 100644
index 0000000..e7b7727
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eeze_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "60a8bb62e3d2cc7dfac14f1cd62343e2"
+SRC_URI[sha256sum] = "7db8709445114d1fe1c3609cf79a06e13a3d584a5a3dfd557642ddc65ac3a202"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
deleted file mode 100644
index 330de4e..0000000
--- a/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "35f4475b81da6b9bf9b3c022fd0947ab"
-SRC_URI[sha256sum] = "b24ee9d2624804b3828b6458eddaf3e74c3d2deac58e15e33e6b183d60989a75"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.0.bb b/meta-efl/recipes-efl/efl/efreet_1.7.0.bb
new file mode 100644
index 0000000..baf8245
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efreet_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "f039197e14288ecef94eeab040cbbdb4"
+SRC_URI[sha256sum] = "16a41a03d55febf30f2dd786b51be3e370fc563f3335dd26832e0eaa88516c79"
diff --git a/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
deleted file mode 100644
index 1a3632c..0000000
--- a/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "f5e123fdb6fb905c69f2f1f54bfe6257"
-SRC_URI[sha256sum] = "051ebf7c4534c4d12f1aaaac7aa91cd877a2498e4c22336db8b07433c27f18c4"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.0.bb b/meta-efl/recipes-efl/efl/eina_1.7.0.bb
new file mode 100644
index 0000000..5313b34
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eina_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "303b81bbfff684eef0e5be70ba977012"
+SRC_URI[sha256sum] = "6aacededb08aa1090a1beecbf62acf3e2ce0676ac87d21c787c07983f801166f"
diff --git a/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
deleted file mode 100644
index 0161318..0000000
--- a/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "5346403eca950b6f8f1c886451e75ab8"
-SRC_URI[sha256sum] = "2cc78170277654e57cc69b49856da3c8ede425f4c8fdf4df702f46184806ac3f"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.0.bb b/meta-efl/recipes-efl/efl/eio_1.7.0.bb
new file mode 100644
index 0000000..59fe18a
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eio_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "02e734ade8de360ef85835c5f5a1f2fa"
+SRC_URI[sha256sum] = "c55ae0a8c303873b85b3b538662e85748154ea0434867291d481ac983c8d962c"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
deleted file mode 100644
index c0ba6fa..0000000
--- a/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "cd0bbf6e93e521b0416d91e521bf81fd"
-SRC_URI[sha256sum] = "f52ef395c341eaf68f844c038ce25512869ebd22f9abc86c9d32f1cf5e91c1df"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.0.bb b/meta-efl/recipes-efl/efl/elementary_1.7.0.bb
new file mode 100644
index 0000000..006590f
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "45263c5d107981a44d28734c82e9fae1"
+SRC_URI[sha256sum] = "7e7deeb4e3a9bbb9c7b7a89c2efbe269a1a6a44ef380bf91c1066d128163e2d3"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
deleted file mode 100644
index f9391bd..0000000
--- a/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "2236f174981c94c4ad22c8e488d2187e"
-SRC_URI[sha256sum] = "fe5339132ec514070af52243954bcb20408a12adfbe07d67d1c338fa3b1dc154"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.0.bb b/meta-efl/recipes-efl/efl/embryo_1.7.0.bb
new file mode 100644
index 0000000..5e95cb1
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/embryo_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "f46bb8ab1699cd7acb8463e50a3ffb4b"
+SRC_URI[sha256sum] = "290b452e6cb87f64b11b529c7f67c40192f87a73cc4c5be93a95f17b76f65063"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
deleted file mode 100644
index 4ad0690..0000000
--- a/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "7b8719248d5745683201bbf11b8d510f"
-SRC_URI[sha256sum] = "f802272d9a7a4678aef736ca24ef1818dbd9f8524c963da6c5680abdf71d05e4"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.0.bb b/meta-efl/recipes-efl/efl/emotion_1.7.0.bb
new file mode 100644
index 0000000..dc0908b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "757f46039cd301d10ba2b9a637e9b2e1"
+SRC_URI[sha256sum] = "6e35baa399135dacd41d5cad21cb23338e6331e926107c3e7bdc33b0da18c22b"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
deleted file mode 100644
index 0da0fb7..0000000
--- a/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "37ec5542731ad088c495e0ee6d7889c8"
-SRC_URI[sha256sum] = "66bf53cee15549c4089307843f27a6a7e0c3bf7e576ab5091950ecc05009644a"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.0.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.0.bb
new file mode 100644
index 0000000..34a3485
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ethumb_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "992a6ecd1345a218e23943ed9af8e030"
+SRC_URI[sha256sum] = "c9b4348a58d28030bba825498246f533211329ad32a3411c02757a78264306ab"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
deleted file mode 100644
index 00956a8..0000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "f4353d2743d255cf30cd7b6f946087e3"
-SRC_URI[sha256sum] = "3dcc04689f89048ce1147698370dd51b854182b70c20704901ee1b3f03d4bd2a"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb
new file mode 100644
index 0000000..8305c2e
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "ca0278ccbf753de78d5847f8665ffcc1"
+SRC_URI[sha256sum] = "0356212b4f64ddc2397d6fb67195bd937248cd82f7f80b248e58d1e709289c8d"
diff --git a/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
deleted file mode 100644
index c761852..0000000
--- a/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-beta"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "0978e24b5ea5a0d0b5eb79a7f6d7d1af"
-SRC_URI[sha256sum] = "5bd52116499a5686023a563ed9102e815292786dff19d617d3cc92829c624caf"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.0.bb b/meta-efl/recipes-efl/efl/evas_1.7.0.bb
new file mode 100644
index 0000000..9f81d89
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "3359918f8e60c778b861cf1cde02d3a9"
+SRC_URI[sha256sum] = "2d7a33d02d2da37647e4c0127fedebe00eeea14560d6c1b6ca9b0cccdae0de84"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
deleted file mode 100644
index ffe6546..0000000
--- a/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRCVER = "1.7.0-alpha"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "fdd425395b8380b5c3b39186f9ef7ff3"
-SRC_URI[sha256sum] = "738eed02cefa2c57cb7ac0fc8103d1680b6d3a4a17d620dd5fc503b0128bf1a5"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.0.bb b/meta-efl/recipes-efl/efl/expedite_1.7.0.bb
new file mode 100644
index 0000000..0ef71ff
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite_1.7.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "4ccd99ad21e25bd651c8ca7a2d20f7f3"
+SRC_URI[sha256sum] = "b4f7d101e957d69b14d1c9207df8d2c9aafcc4a8a0ddea7883c393ef4389249f"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 04/10] e-wm: update RRECOMMENDS_-config-mobile

[Martin Jansa]

* I've forgot to rename this when illume2 was renamed to mobile

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/e17/e-wm_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 8e70507..a6f56bd 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r5"
+PR = "r6"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext
@@ -163,7 +163,7 @@ FILES_illume-keyboard-default-terminal = "\
 "
 
 RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
-RRECOMMENDS_${PN}-config-illume2 = "\
+RRECOMMENDS_${PN}-config-mobile = "\
   illume-keyboard-default-alpha \
   illume-keyboard-default-numeric \
   illume-keyboard-default-terminal \
-- 
1.7.12

[meta-oe][meta-efl][PATCH 05/10] task-x11-illume: update default ECONFIG

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/tasks/task-x11-illume.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-efl/recipes-efl/tasks/task-x11-illume.bb b/meta-efl/recipes-efl/tasks/task-x11-illume.bb
index 20cf2b8..eb628b7 100644
--- a/meta-efl/recipes-efl/tasks/task-x11-illume.bb
+++ b/meta-efl/recipes-efl/tasks/task-x11-illume.bb
@@ -3,15 +3,13 @@ SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-openembedded/meta-efl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
-PR = "r2"
-
-# WORK IN PROGRESS
+PR = "r3"
 
 inherit task allarch
 
 # Default theme and config
 ETHEME ?= "e-wm-theme-default"
-ECONFIG ?= "e-wm-config-illume2"
+ECONFIG ?= "e-wm-config-mobile"
 
 RDEPENDS_${PN} = "\
   task-x11-server \
-- 
1.7.12

[meta-oe][meta-efl][PATCH 06/10] python-efl: upgrade svn recipes to 1.7.0+svn

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/conf/distro/include/efl-from-svn-recipes.inc     | 13 ++++++-------
 meta-efl/recipes-devtools/python/python-ecore_svn.bb      |  2 +-
 meta-efl/recipes-devtools/python/python-edbus_svn.bb      |  2 +-
 meta-efl/recipes-devtools/python/python-edje_svn.bb       |  2 +-
 meta-efl/recipes-devtools/python/python-elementary_svn.bb |  2 +-
 meta-efl/recipes-devtools/python/python-emotion_svn.bb    |  2 +-
 meta-efl/recipes-devtools/python/python-evas_svn.bb       |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
index c28e281..d3a7e81 100644
--- a/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
+++ b/meta-efl/conf/distro/include/efl-from-svn-recipes.inc
@@ -30,12 +30,11 @@ PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}"
 
-EFL_PYTHON_PREFERRED_VERSION ?= "1.6.99+svn%"
-PREFERRED_VERSION_python-elementary ?= "${EFL_PYTHON_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-ecore ?= "${EFL_PYTHON_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-edbus ?= "${EFL_PYTHON_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-edje ?= "${EFL_PYTHON_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-emotion ?= "${EFL_PYTHON_PREFERRED_VERSION}"
-PREFERRED_VERSION_python-evas ?= "${EFL_PYTHON_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-elementary ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-ecore ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edbus ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edje ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-emotion ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-evas ?= "${EFL_PREFERRED_VERSION}"
 
 PREFERRED_VERSION_terminology ?= "0.1.0+svn%"
diff --git a/meta-efl/recipes-devtools/python/python-ecore_svn.bb b/meta-efl/recipes-devtools/python/python-ecore_svn.bb
index a0298e8..d551073 100644
--- a/meta-efl/recipes-devtools/python/python-ecore_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-ecore_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_svn.bb b/meta-efl/recipes-devtools/python/python-edbus_svn.bb
index a0298e8..d551073 100644
--- a/meta-efl/recipes-devtools/python/python-edbus_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-edbus_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb
index 3d392d0..eca8b75 100644
--- a/meta-efl/recipes-devtools/python/python-edje_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-edje_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
index a0298e8..d551073 100644
--- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_svn.bb b/meta-efl/recipes-devtools/python/python-emotion_svn.bb
index a0298e8..d551073 100644
--- a/meta-efl/recipes-devtools/python/python-emotion_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-emotion_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
diff --git a/meta-efl/recipes-devtools/python/python-evas_svn.bb b/meta-efl/recipes-devtools/python/python-evas_svn.bb
index a0298e8..d551073 100644
--- a/meta-efl/recipes-devtools/python/python-evas_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-evas_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.99+svnr${SRCPV}"
+PV = "1.7.0+svnr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 07/10] python-efl: upgrade recipes to 1.7.0

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb      | 6 ------
 meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb            | 5 +++++
 meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb      | 6 ------
 meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb            | 5 +++++
 meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb       | 7 -------
 meta-efl/recipes-devtools/python/python-edje_1.7.0.bb             | 6 ++++++
 meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb | 6 ------
 meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb       | 5 +++++
 meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb    | 6 ------
 meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb          | 5 +++++
 meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb       | 6 ------
 meta-efl/recipes-devtools/python/python-evas_1.7.0.bb             | 5 +++++
 12 files changed, 31 insertions(+), 37 deletions(-)
 delete mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
 delete mode 100644 meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb
 create mode 100644 meta-efl/recipes-devtools/python/python-evas_1.7.0.bb

diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb
deleted file mode 100644
index f2c7750..0000000
--- a/meta-efl/recipes-devtools/python/python-ecore_1.6.99-beta.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-
-SRC_URI[md5sum] = "7cd483e817e41017adcd23cea4ce462d"
-SRC_URI[sha256sum] = "09a99f728b946c44955ad91e3ac072643e533ded74110f481e27b8f035877a95"
diff --git a/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb b/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
new file mode 100644
index 0000000..17b7137
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-ecore_1.7.0.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "15dd908b71d09ef30f7e758739f3b6fd"
+SRC_URI[sha256sum] = "45d374ffab243b561718897e4eac9aadc1e7ce6e34321a3e728a5f6d07d1e9b6"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb
deleted file mode 100644
index b3d0e2e..0000000
--- a/meta-efl/recipes-devtools/python/python-edbus_1.6.99-beta.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-
-SRC_URI[md5sum] = "d6140208bb2608bd320a70298c0c4234"
-SRC_URI[sha256sum] = "468bc77dc1b64d04c688b2f07ddcbeac406d984121b90e78ba802c92e58e4daf"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb b/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
new file mode 100644
index 0000000..5628469
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "40b479444bb06147429a276127981890"
+SRC_URI[sha256sum] = "78e5ca334ee25185748660b4e612f984f4d3bced018f062278701429868f117b"
diff --git a/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb
deleted file mode 100644
index 3d88425..0000000
--- a/meta-efl/recipes-devtools/python/python-edje_1.6.99-beta.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-SRC_URI += "file://0001-fix-unicode-conversion.patch"
-
-SRC_URI[md5sum] = "eac613c2f3d88d30ba1adf4acd5090bf"
-SRC_URI[sha256sum] = "6ce7b57a4afaddf8dbf423543380cdc798c954b31ffd9d47e6af9536786abc05"
diff --git a/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb b/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
new file mode 100644
index 0000000..9a30ad4
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-edje_1.7.0.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRC_URI += "file://0001-fix-unicode-conversion.patch"
+
+SRC_URI[md5sum] = "1e0d7a4a4504298caaad0cee476e4edb"
+SRC_URI[sha256sum] = "b1eb7be4dea099752c587baa4747d8100de6cead256ffea22a6cc0e88c4e8786"
diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb
deleted file mode 100644
index be63412..0000000
--- a/meta-efl/recipes-devtools/python/python-elementary_1.6.99-beta.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-
-SRC_URI[md5sum] = "f2b801aa8fe53914abbcfdf14aa1d325"
-SRC_URI[sha256sum] = "1255bab89b824754c1a0909f2646ff63fd0e12478e0bfbfbdc3cfd48ea9bfa25"
diff --git a/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb b/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
new file mode 100644
index 0000000..625c09d
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-elementary_1.7.0.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "38c8b2ac508ab4e1d12f1557a12169c9"
+SRC_URI[sha256sum] = "63052f8428d725599a0a2765fe48a21e695c66599ec1dcce0a909db440d2216b"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb
deleted file mode 100644
index 976cf56..0000000
--- a/meta-efl/recipes-devtools/python/python-emotion_1.6.99-beta.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-
-SRC_URI[md5sum] = "3cfd52e8415f48d77fdb1fe73244c2b2"
-SRC_URI[sha256sum] = "76d673b99e5e894b469bb04f67a14492a6021edc95762ba71da7b24c36fa660a"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb b/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
new file mode 100644
index 0000000..01e6751
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-emotion_1.7.0.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "ac7197ce2617a87fad3dd134a98ad01f"
+SRC_URI[sha256sum] = "ac2910c0e3e861dfc07253b825dc038baa1a3e6ce7d5b362122ad51127e20e91"
diff --git a/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb b/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb
deleted file mode 100644
index cabc9c8..0000000
--- a/meta-efl/recipes-devtools/python/python-evas_1.6.99-beta.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-beta"
-
-SRC_URI[md5sum] = "19262c0baac27f35f136e4aaa3ca0171"
-SRC_URI[sha256sum] = "6784109dc637bd8a50f31eb3a9ff31e0eece0fba04c8a2a527d6bd83c1b02cf8"
diff --git a/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb b/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
new file mode 100644
index 0000000..62219d8
--- /dev/null
+++ b/meta-efl/recipes-devtools/python/python-evas_1.7.0.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "c3fda2025171f5e3d2bc224e8bae88e5"
+SRC_URI[sha256sum] = "bc00ea23d4d3e9d6448c8a24f918f577cf3c2b25636f36b76b2ed2e3a74d42f5"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 08/10] xf86-video-glamo: add xserver-xorg-module-exa to RDEPENDS

[Martin Jansa]

* it was separated from xserver-xorg package and glamo fails in runtime without that
  http://git.openembedded.org/openembedded-core/commit/?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 6fb78ab..10120b1 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -1,12 +1,13 @@
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
 DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
 DEPENDS += "libdrm"
+RDEPENDS_${PN} += "xserver-xorg-module-exa"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 
 PE = "2"
 PV = "1.0.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
            file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
-- 
1.7.12

[meta-oe][meta-efl][PATCH 09/10] task*: rename to packagegroup to match oe-core

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-core/meta/meta-toolchain-efl.bb               |  2 +-
 .../task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb}  |  4 ++--
 .../packagegroup-efl-sdk.inc}                                  |  0
 .../packagegroup-efl-standalone-sdk-target.bb}                 |  4 ++--
 .../task-basic.bb => packagegroups/packagegroup-basic.bb}      |  6 +++---
 .../{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} |  2 +-
 .../packagegroup-cli-tools.bb}                                 |  2 +-
 .../packagegroup-sdk-target.bb}                                |  4 ++--
 .../packagegroup-fonts-truetype.bb}                            | 10 +++++-----
 .../packagegroup-qte-toolchain-target.bbappend}                |  0
 .../packagegroup-basic.bbappend}                               |  0
 .../packagegroup-xfce-base.bb}                                 |  2 +-
 .../packagegroup-xfce-extended.bb}                             |  4 ++--
 13 files changed, 20 insertions(+), 20 deletions(-)
 rename meta-efl/recipes-efl/{tasks/task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} (84%)
 rename meta-efl/recipes-efl/{tasks/task-efl-sdk.inc => packagegroups/packagegroup-efl-sdk.inc} (100%)
 rename meta-efl/recipes-efl/{tasks/task-efl-standalone-sdk-target.bb => packagegroups/packagegroup-efl-standalone-sdk-target.bb} (81%)
 rename meta-oe/recipes-core/{tasks/task-basic.bb => packagegroups/packagegroup-basic.bb} (89%)
 rename meta-oe/recipes-core/{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} (97%)
 rename meta-oe/recipes-core/{tasks/task-cli-tools.bb => packagegroups/packagegroup-cli-tools.bb} (96%)
 rename meta-oe/recipes-devtools/{tasks/task-sdk-target.bb => packagegroups/packagegroup-sdk-target.bb} (91%)
 rename meta-oe/recipes-graphics/{tasks/task-fonts-truetype.bb => packagegroups/packagegroup-fonts-truetype.bb} (72%)
 rename meta-oe/recipes-qt/{tasks/task-qte-toolchain-target.bbappend => packagegroups/packagegroup-qte-toolchain-target.bbappend} (100%)
 rename meta-systemd/meta-oe/recipes-core/{tasks/task-basic.bbappend => packagegroups/packagegroup-basic.bbappend} (100%)
 rename meta-xfce/recipes-xfce/{tasks/task-xfce-base.bb => packagegroups/packagegroup-xfce-base.bb} (97%)
 rename meta-xfce/recipes-xfce/{tasks/task-xfce-extended.bb => packagegroups/packagegroup-xfce-extended.bb} (95%)

diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
index 875d8f8..b7b7fca 100644
--- a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
+++ b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
@@ -1,4 +1,4 @@
-TOOLCHAIN_TARGET_EFLTASK ?= "task-efl-standalone-sdk-target task-efl-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_EFLTASK ?= "packagegroup-efl-standalone-sdk-target packagegroup-efl-standalone-sdk-target-dbg"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_EFLTASK}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-efl-${DISTRO_VERSION}"
 require recipes-core/meta/meta-toolchain.bb
diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
similarity index 84%
rename from meta-efl/recipes-efl/tasks/task-efl-sdk.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index 5c1a13a..bfaf5d4 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
-    task-core-sdk \
+    packagegroup-core-sdk \
     ${SDK-EFL} \
     ${SDK-EXTRAS}"
diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
similarity index 100%
rename from meta-efl/recipes-efl/tasks/task-efl-sdk.inc
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
similarity index 81%
rename from meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
index 95a66b9..21d1540 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN} ${PN}-dbg"
 
 RDEPENDS_${PN} = "\
-    task-core-standalone-sdk-target \
+    packagegroup-core-standalone-sdk-target \
     ${SDK-EFL} \
     ${SDK-EXTRAS}"
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
similarity index 89%
rename from meta-oe/recipes-core/tasks/task-basic.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 47b09de..e46afc2 100644
--- a/meta-oe/recipes-core/tasks/task-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -1,4 +1,4 @@
-# This recipe is intended as a 'simpler' replacement for task-base.
+# This recipe is intended as a 'simpler' replacement for packagegroup-base.
 # Please communicate your use cases and suggestions to the mailinglist(s)
 
 DESCRIPTION = "Basic task to get a device online"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r9"
 
-inherit task
+inherit packagegroup
 
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
@@ -24,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
 TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
 
 #
-# The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom 
+# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom 
 # when writing image recipes.
 # It also avoids the choice between connman/networkmanager/ifupdown since that is an image feature, not a
 # distro feature.
diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
similarity index 97%
rename from meta-oe/recipes-core/tasks/task-boot.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index 6c27ffe..ac31118 100644
--- a/meta-oe/recipes-core/tasks/task-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r57"
 
-inherit task
+inherit packagegroup
 
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
similarity index 96%
rename from meta-oe/recipes-core/tasks/task-cli-tools.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index a849978..0ab3703 100644
--- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 PV = "1.0"
 PR = "r19"
 
-inherit task allarch
+inherit packagegroup allarch
 
 PACKAGES += "${PN}-debug"
 
diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
similarity index 91%
rename from meta-oe/recipes-devtools/tasks/task-sdk-target.bb
rename to meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 03141f2..3ad9b55 100644
--- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-inherit task allarch
+inherit packagegroup allarch
 
-RPROVIDES_${PN} = "task-native-sdk"
+RPROVIDES_${PN} = "packagegroup-native-sdk"
 RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
                   binutils-symlinks \
                   perl-modules \
diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
similarity index 72%
rename from meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
rename to meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 112e8cb..816a67f 100644
--- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 PV = "1.0"
 PR = "r1"
 
-inherit task allarch
+inherit packagegroup allarch
 
 PACKAGES += "\
   ${PN}-core \
@@ -13,13 +13,13 @@ PACKAGES += "\
   ${PN}-japanese \
 "
 
-RRECOMMENDS_task-fonts-truetype = "\
+RRECOMMENDS_packagegroup-fonts-truetype = "\
   ${PN}-core \
   ${PN}-chinese \
   ${PN}-japanese \
 "
 
-RDEPENDS_task-fonts-truetype-core = "\
+RDEPENDS_packagegroup-fonts-truetype-core = "\
   fontconfig-utils \
   \
   ttf-dejavu-common \
@@ -28,12 +28,12 @@ RDEPENDS_task-fonts-truetype-core = "\
 "
 #  ttf-dejavu-serif \
 
-RDEPENDS_task-fonts-truetype-chinese = "\
+RDEPENDS_packagegroup-fonts-truetype-chinese = "\
   ${PN}-core \
   ttf-arphic-uming \
 "
 
-RDEPENDS_task-fonts-truetype-japanese = "\
+RDEPENDS_packagegroup-fonts-truetype-japanese = "\
   ${PN}-core \
   ttf-sazanami-gothic \
   ttf-sazanami-mincho \
diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
similarity index 100%
rename from meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
rename to meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
rename to meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
similarity index 97%
rename from meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index d9fcc30..7627576 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 PR = "r2"
 
-inherit task
+inherit packagegroup
 
 RDEPENDS_${PN} = " \
     xfwm4 \
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
similarity index 95%
rename from meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 0c13a64..469a2b7 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r3"
 
-inherit task
+inherit packagegroup
 
 # mandatory
 RDEPENDS_${PN} = " \
-    task-xfce-base \
+    packagegroup-xfce-base \
 "
 
 # nice to have
-- 
1.7.12

[meta-oe][meta-efl][PATCH 10/10] packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../packagegroups/packagegroup-efl-sdk.bb          |  5 +++++
 .../packagegroup-efl-standalone-sdk-target.bb      |  5 +++++
 .../packagegroups/packagegroup-basic.bb            |  5 ++++-
 .../packagegroups/packagegroup-boot.bb             |  6 +++++-
 .../packagegroups/packagegroup-cli-tools.bb        |  9 ++++++++-
 .../packagegroups/packagegroup-sdk-target.bb       |  6 +++++-
 .../packagegroups/packagegroup-fonts-truetype.bb   | 22 +++++++++++++++++-----
 .../packagegroups/packagegroup-xfce-base.bb        |  6 +++++-
 .../packagegroups/packagegroup-xfce-extended.bb    |  6 +++++-
 9 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index bfaf5d4..0906ef5 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -5,10 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
+PR = "r1"
+
 require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN}"
 
+RPROVIDES_${PN} += "task-efl-sdk"
+RREPLACES_${PN} += "task-efl-sdk"
+RCONFLICTS_${PN} += "task-efl-sdk"
 RDEPENDS_${PN} = "\
     packagegroup-core-sdk \
     ${SDK-EFL} \
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
index 21d1540..ea4b751 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -5,10 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
+PR = "r1"
+
 require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN} ${PN}-dbg"
 
+RPROVIDES_${PN} += "task-efl-standalone-sdk-target"
+RREPLACES_${PN} += "task-efl-standalone-sdk-target"
+RCONFLICTS_${PN} += "task-efl-standalone-sdk-target"
 RDEPENDS_${PN} = "\
     packagegroup-core-standalone-sdk-target \
     ${SDK-EFL} \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index e46afc2..493ef5e 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r9"
+PR = "r10"
 
 inherit packagegroup
 
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
 #
 TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
 
+RPROVIDES_${PN} += "task-basic"
+RREPLACES_${PN} += "task-basic"
+RCONFLICTS_${PN} += "task-basic"
 #
 # The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom 
 # when writing image recipes.
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index ac31118..1d6ae9e 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic task to get a device booting"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r57"
+PR = "r58"
 
 inherit packagegroup
 
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 # Make sure we build the kernel
 DEPENDS = "virtual/kernel"
 
+RPROVIDES_${PN} += "task-boot"
+RREPLACES_${PN} += "task-boot"
+RCONFLICTS_${PN} += "task-boot"
+
 #
 # minimal set of packages - needed to boot
 #
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index 0ab3703..07fb056 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -4,12 +4,19 @@ SECTION = "console"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
-PR = "r19"
+PR = "r20"
 
 inherit packagegroup allarch
 
 PACKAGES += "${PN}-debug"
 
+RPROVIDES_${PN} += "task-cli-tools"
+RPROVIDES_${PN}-debug += "task-cli-tools-debug"
+RREPLACES_${PN} += "task-cli-tools"
+RREPLACES_${PN}-debug += "task-cli-tools-debug"
+RCONFLICTS_${PN} += "task-cli-tools"
+RCONFLICTS_${PN}-debug += "task-cli-tools-debug"
+
 RDEPENDS_${PN} = "\
   dbus-daemon-proxy \
   dosfstools \
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 3ad9b55..b9e5a29 100644
--- a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
+PR = "r1"
+
 inherit packagegroup allarch
 
-RPROVIDES_${PN} = "packagegroup-native-sdk"
+RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
+RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
+RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
 RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
                   binutils-symlinks \
                   perl-modules \
diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 816a67f..76126fc 100644
--- a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -3,7 +3,7 @@ SECTION = "fonts"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
-PR = "r1"
+PR = "r2"
 
 inherit packagegroup allarch
 
@@ -12,14 +12,26 @@ PACKAGES += "\
   ${PN}-chinese \
   ${PN}-japanese \
 "
+RPROVIDES_${PN} += "task-fonts-truetype"
+RPROVIDES_${PN}-core += "task-fonts-truetype-core"
+RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese"
+RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese"
+RREPLACES_${PN} += "task-fonts-truetype"
+RREPLACES_${PN}-core += "task-fonts-truetype-core"
+RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese"
+RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese"
+RCONFLICTS_${PN} += "task-fonts-truetype"
+RCONFLICTS_${PN}-core += "task-fonts-truetype-core"
+RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese"
+RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese"
 
-RRECOMMENDS_packagegroup-fonts-truetype = "\
+RRECOMMENDS_${PN} = "\
   ${PN}-core \
   ${PN}-chinese \
   ${PN}-japanese \
 "
 
-RDEPENDS_packagegroup-fonts-truetype-core = "\
+RDEPENDS_${PN}-core = "\
   fontconfig-utils \
   \
   ttf-dejavu-common \
@@ -28,12 +40,12 @@ RDEPENDS_packagegroup-fonts-truetype-core = "\
 "
 #  ttf-dejavu-serif \
 
-RDEPENDS_packagegroup-fonts-truetype-chinese = "\
+RDEPENDS_${PN}-chinese = "\
   ${PN}-core \
   ttf-arphic-uming \
 "
 
-RDEPENDS_packagegroup-fonts-truetype-japanese = "\
+RDEPENDS_${PN}-japanese = "\
   ${PN}-core \
   ttf-sazanami-gothic \
   ttf-sazanami-mincho \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index 7627576..41e1d4a 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -2,10 +2,14 @@ DESCRIPTION = "All packages required for a base installation of XFCE"
 SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r2"
+PR = "r3"
 
 inherit packagegroup
 
+RPROVIDES_${PN} += "task-xfce-base"
+RREPLACES_${PN} += "task-xfce-base"
+RCONFLICTS_${PN} += "task-xfce-base"
+
 RDEPENDS_${PN} = " \
     xfwm4 \
     xfwm4-theme-default \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 469a2b7..ebe2dc7 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -3,10 +3,14 @@ SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r3"
+PR = "r4"
 
 inherit packagegroup
 
+RPROVIDES_${PN} += "task-xfce-extended"
+RREPLACES_${PN} += "task-xfce-extended"
+RCONFLICTS_${PN} += "task-xfce-extended"
+
 # mandatory
 RDEPENDS_${PN} = " \
     packagegroup-xfce-base \
-- 
1.7.12