aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-08-20 04:37:24 +0000
committerLinaro Code Review <review@review.linaro.org>2015-08-20 04:37:24 +0000
commit4462028cdb5acd98d744a92f10edbe515e2592fe (patch)
tree6875d438091dcc0364383d2143576e514d35161a
parentb532e0b6a695d602dacff282a18e9ebe9bcc0514 (diff)
parent49e643cf748ef524aa22b8a2fc9f6b4f97666366 (diff)
Merge "trinity: update to 1.5"
-rw-r--r--meta-linaro/recipes-extra/trinity/trinity_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-linaro/recipes-extra/trinity/trinity_git.bb b/meta-linaro/recipes-extra/trinity/trinity_git.bb
index b927d62c..f0f09a85 100644
--- a/meta-linaro/recipes-extra/trinity/trinity_git.bb
+++ b/meta-linaro/recipes-extra/trinity/trinity_git.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=96094d47cfbd2cc45eb46ce0fc423c04"
COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
-PV = "1.4+1.5pre"
-SRCREV = "985a08744aeb8bccb0b50145375092e2a466a6da"
-SRC_URI = "git://github.com/kernelslacker/trinity.git;protocol=https \
+PV = "1.5"
+SRCREV = "edc2e693e298e0372010a361354c4a79a3cd93f3"
+SRC_URI = "git://github.com/kernelslacker/trinity.git;protocol=https;nobranch=1 \
"
S = "${WORKDIR}/git"