summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-08-05 15:40:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 22:40:56 +0100
commitdd8e38545883b9fbdf323b38480ee7bad20c9d49 (patch)
treeb5c7aa19a103a29e7be2c879c97ae793374d9a26 /meta
parent918379aecf798c7e5319dc5daf24142c27b2db6c (diff)
downloadpoky-dd8e38545883b9fbdf323b38480ee7bad20c9d49.tar.gz
package_regex.inc: fix regexes for adwaita-icon-theme, cairo and dhcp
(From OE-Core rev: c9b13e4e16d78bb25a502749ef98d31f0e58c4a2) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/package_regex.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc
index 037fdaace6..0c29adebe1 100644
--- a/meta/conf/distro/include/package_regex.inc
+++ b/meta/conf/distro/include/package_regex.inc
@@ -32,7 +32,7 @@ REGEX_URI_pn-sqlite3="http://www.sqlite.org/"
32REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html" 32REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html"
33 33
34REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/" 34REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/"
35REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))" 35REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))/"
36 36
37REGEX_pn-foomatic-filters = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz" 37REGEX_pn-foomatic-filters = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz"
38REGEX_pn-xdg-utils = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" 38REGEX_pn-xdg-utils = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
@@ -42,6 +42,8 @@ REGEX_pn-libtheora = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
42REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar" 42REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar"
43REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" 43REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
44 44
45REGEX_pn-cairo = "cairo-(?P<pver>\d+(\.\d+)+)\.tar"
46
45# Exclude NC versions which lack AES encryption 47# Exclude NC versions which lack AES encryption
46REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" 48REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
47 49
@@ -224,6 +226,7 @@ REGEX_pn-clutter-1.0 = "${GNOME_STABLE}"
224REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}" 226REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}"
225REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}" 227REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
226REGEX_pn-cogl-1.0 = "${GNOME_STABLE}" 228REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
229REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
227 230
228# not GNOME related but uses same even-minor-release-is-stable logic 231# not GNOME related but uses same even-minor-release-is-stable logic
229REGEX_pn-dbus = "${GNOME_STABLE}" 232REGEX_pn-dbus = "${GNOME_STABLE}"