aboutsummaryrefslogtreecommitdiffstats
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 17:28:13 +0100
commitc9b13e4e16d78bb25a502749ef98d31f0e58c4a2 (patch)
tree28e70f7c6d590c574c960006be4ceed0ea869b5c
parente95e6b0bdfe1bc9b71af82e3be260300232bb77e (diff)
downloadopenembedded-core-contrib-c9b13e4e16d78bb25a502749ef98d31f0e58c4a2.tar.gz
package_regex.inc: fix regexes for adwaita-icon-theme, cairo and dhcp
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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/"
REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html"
REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/"
-REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))"
+REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))/"
REGEX_pn-foomatic-filters = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz"
REGEX_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)"
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"
+
# Exclude NC versions which lack AES encryption
REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
@@ -224,6 +226,7 @@ REGEX_pn-clutter-1.0 = "${GNOME_STABLE}"
REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}"
REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
+REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
# not GNOME related but uses same even-minor-release-is-stable logic
REGEX_pn-dbus = "${GNOME_STABLE}"