[morty][PATCH 0/3] morty backports

[morty][PATCH 0/3] morty backports

[Andre McCurdy]

Alexander Kanavin (2):
  upstream-version-is-even.bbclass: ensure that the full version is
    matched.
  upstream-version-is-even.bbclass: exclude various alphas, betas,
    pre-releases etc.

brian avery (1):
  nativesdk-packagegroup-sdk-host.bb: add cmake

 meta/classes/upstream-version-is-even.bbclass                      | 2 +-
 meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
1.9.1

[morty][PATCH 1/3] upstream-version-is-even.bbclass: ensure that the full version is matched.

[Andre McCurdy]

From: Alexander Kanavin <alexander.kanavin@linux.intel.com>

Previously 4.3.2.1 would match as 3.2.1.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit b066910f64ba964a8a0bb452925591eed1e16940)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/upstream-version-is-even.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/upstream-version-is-even.bbclass b/meta/classes/upstream-version-is-even.bbclass
index 89556ed..99714cb 100644
--- a/meta/classes/upstream-version-is-even.bbclass
+++ b/meta/classes/upstream-version-is-even.bbclass
@@ -2,4 +2,4 @@
 # accepts even minor versions (i.e. 3.0.x, 3.2.x, 3.4.x, etc.)
 # This scheme is used by Gnome and a number of other projects
 # to signify stable releases vs development releases.
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
-- 
1.9.1

[morty][PATCH 2/3] upstream-version-is-even.bbclass: exclude various alphas, betas, pre-releases etc.

[Andre McCurdy]

From: Alexander Kanavin <alexander.kanavin@linux.intel.com>

Was a problem with perl in particular.

(From OE-Core rev: cc40b3ad2c4a725f93d0b984f23d34d247cffb2f)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 428531463574f4e7722912d1960bd288df586c14)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/upstream-version-is-even.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/upstream-version-is-even.bbclass b/meta/classes/upstream-version-is-even.bbclass
index 99714cb..256c752 100644
--- a/meta/classes/upstream-version-is-even.bbclass
+++ b/meta/classes/upstream-version-is-even.bbclass
@@ -2,4 +2,4 @@
 # accepts even minor versions (i.e. 3.0.x, 3.2.x, 3.4.x, etc.)
 # This scheme is used by Gnome and a number of other projects
 # to signify stable releases vs development releases.
-UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar"
-- 
1.9.1

[morty][PATCH 3/3] nativesdk-packagegroup-sdk-host.bb: add cmake

[Andre McCurdy]

From: brian avery <brian.avery@intel.com>

The Eclipse plugin uses cmake from the SDK and currently has issues
because cmake is not installed as a host tool.  This patch adds cmake as
a host tool for the sdk/esdk.

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit b1ccab95464855877558972c4523956be32dee36)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 2c2abed..832d7c7 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -23,6 +23,7 @@ RDEPENDS_${PN} = "\
     nativesdk-shadow \
     nativesdk-makedevs \
     nativesdk-smartpm \
+    nativesdk-cmake \
     nativesdk-postinst-intercept \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
     "
-- 
1.9.1