From: Alexander Kanavin Date: Sat, 17 Mar 2018 11:15:39 +0000 (+0200) Subject: glibc: fix upstream version check X-Git-Tag: uninative-1.9~138 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3fa440b0d8090135a66f6ddbd0db77c94760686e;p=openembedded-core.git glibc: fix upstream version check Exclude x.y.90* pre-release versions in particular. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- 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:" SRCBRANCH ?= "release/${PV}/master" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.(?!90)\d+)*)" SRCREV_glibc ?= "23158b08a0908f381459f273a984c6fd328363cb" SRCREV_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" SRCBRANCH ?= "release/${PV}/master" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.(?!90)\d+)*)" SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://etc/ld.so.conf \