From bb72a8645a64d6b0f68e50d96d4bad648c806a9c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Fri, 28 Aug 2015 15:18:55 +0300
Subject: package_regex.inc: updates to improve upstream tracking

(From OE-Core rev: 04288b352c8a09fa347d0fa11fbed73544a7eea3)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/package_regex.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'meta/conf')

diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 0c29adebe1..df384e2f0e 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -43,6 +43,7 @@ REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar"
 REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
 
 REGEX_pn-cairo = "cairo-(?P<pver>\d+(\.\d+)+)\.tar"
+REGEX_pn-cmake = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
 # Exclude NC versions which lack AES encryption
 REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
@@ -199,6 +200,9 @@ GITTAGREGEX_pn-sgmlspl = "(?P<pver>(\d+(\.\d+)+))"
 # Exclude x.99.x versions
 GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)"
 
+# Blacklist a bogus tag
+GITTAGREGEX_pn-file = "FILE(?P<pver>(?!6_23).+)"
+
 # GNOME related.
 #
 # GNOME2_STABLE picks stable releases in the 2.x series (so not 2.90 onwards,
@@ -206,8 +210,8 @@ GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)"
 #
 # GNOME_STABLE picks the latest stable release.
 
-GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+\.\d+)"
-GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+\.\d+)"
+GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
+GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 
 REGEX_pn-glib-2.0 = "${GNOME_STABLE}"
 REGEX_pn-atk = "${GNOME_STABLE}"
-- 
cgit v1.2.3-54-g00ecf