sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

distro: update include files related to webkitgtk and epiphany addition 

This commit fixes recipe metadata in distro_alias, package_regex and
upstream_tracking includes.

(From OE-Core rev: 3fe3df9ea152d6ec39e114d831be24e1aa529165)

(From OE-Core rev: 1902645cb0a5eb11a19126a8b22fbbfee13e0c40)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2015-08-14 11:34:37 +03:00 committed by Richard Purdie
parent 8fcb01cd85
commit b5a433fe15
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/distro_alias.inc
View File

@ -472,7 +472,7 @@ DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d"
DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto"
DISTRO_PN_ALIAS_pn-waffle = "OE-Core"
DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog"
DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk Ubuntu=libwebkit"
DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit"
DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand"
DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston"
DISTRO_PN_ALIAS_pn-weston-init = "OE-Core"

8
meta/conf/distro/include/package_regex.inc
View File

@ -25,9 +25,6 @@ COMMON_REGEX = "(?P<pver>(\d+[\.\-_]*)+)"
REGEX_URI_pn-wireless-tools = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
REGEX_pn-wireless-tools = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz"
REGEX_URI_pn-midori="http://midori-browser.org/download/source/"
REGEX_pn-midori="midori_(?P<pver>((\d+[\.\-_]*)+))_all_\.tar\.bz2"
REGEX_URI_pn-sqlite3="http://www.sqlite.org/"
REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html"
@ -97,6 +94,7 @@ REGEX_URI_pn-python-smartpm="https://launchpad.net/smart/trunk/"
REGEX_URI_pn-lsof = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
REGEX_URI_pn-pbzip2 = "http://compression.ca/pbzip2/"
REGEX_URI_pn-quicky = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482"
REGEX_URI_pn-libwebp = "http://downloads.webmproject.org/releases/webp/index.html"
# The engine tries to use directory versioning but is a false-positive
REGEX_URI_pn-intltool = "https://launchpad.net/intltool/trunk/"
@ -237,6 +235,10 @@ REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}"
REGEX_pn-cogl-1.0 = "${GNOME_STABLE}"
REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}"
REGEX_pn-vte = "${GNOME_STABLE}"
REGEX_pn-epiphany = "${GNOME_STABLE}"
REGEX_pn-webkitgtk = "${GNOME_STABLE}"
REGEX_pn-p11-kit = "${GNOME_STABLE}"
REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}"
# not GNOME related but uses same even-minor-release-is-stable logic
REGEX_pn-dbus = "${GNOME_STABLE}"