summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-17 13:15:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-20 09:59:32 +0000
commitc256b715e68e21ffc42875d229fb69403db4b4f3 (patch)
tree479fe2491f0469057caa4ba13136c7ebe6e1af38
parent35b28399d5ac6935d6fcfcd4dfa4aca5caafcc5e (diff)
downloadpoky-c256b715e68e21ffc42875d229fb69403db4b4f3.tar.gz
glibc: fix upstream version check
Exclude x.y.90* pre-release versions in particular. (From OE-Core rev: 3fa440b0d8090135a66f6ddbd0db77c94760686e) 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>
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.27.bb2
-rw-r--r--meta/recipes-core/glibc/glibc_2.27.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
index f1e4a657cf..6344c7acd0 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
@@ -19,7 +19,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
19 19
20SRCBRANCH ?= "release/${PV}/master" 20SRCBRANCH ?= "release/${PV}/master"
21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
23 23
24SRCREV_glibc ?= "23158b08a0908f381459f273a984c6fd328363cb" 24SRCREV_glibc ?= "23158b08a0908f381459f273a984c6fd328363cb"
25SRCREV_localedef ?= "de5bdbd5e76b5403a4151b9b9f958b6cca36b3e7" 25SRCREV_localedef ?= "de5bdbd5e76b5403a4151b9b9f958b6cca36b3e7"
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.27.bb
index c4042d16fe..827857dfc8 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -12,7 +12,7 @@ SRCREV ?= "23158b08a0908f381459f273a984c6fd328363cb"
12SRCBRANCH ?= "release/${PV}/master" 12SRCBRANCH ?= "release/${PV}/master"
13 13
14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
16 16
17SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 17SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
18 file://etc/ld.so.conf \ 18 file://etc/ld.so.conf \