diff options
| author |   Dan McGregor <dan.mcgregor@usask.ca> | 2015-02-06 11:20:19 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-19 17:04:19 +0000 |
| commit | 530565c6cb77319f4cc49edeea6fec6be997415d (patch) | |
| tree | d4578c7b0b81866bd6c5de280472324415acaf75 /meta/recipes-core/glibc | |
| parent | 6617cc92076764d51f0190786f8d62b8c99ae984 (diff) | |
| download | openembedded-core-contrib-530565c6cb77319f4cc49edeea6fec6be997415d.tar.gz | |
glibc: Update to glibc 2.21 release tag
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-core/glibc')
| -rw-r--r-- | meta/recipes-core/glibc/cross-localedef-native_2.21.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.21.bb | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.21.bb b/meta/recipes-core/glibc/cross-localedef-native_2.21.bb index 814ae9df92..4e15f02140 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.21.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.21.bb @@ -14,12 +14,11 @@ inherit autotools FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" -#BRANCH = "release/${PV}/master" -BRANCH = "master" +BRANCH = "release/${PV}/master" SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ - file://fix_for_centos_5.8.patch \ + file://fix_for_centos_5.8.patch \ ${EGLIBCPATCHES} \ " EGLIBCPATCHES = "\ @@ -34,7 +33,7 @@ EGLIBCPATCHES = "\ file://eglibc-use-option-groups.patch \ " -SRCREV_glibc = "edac0a60c7514b8c9b59488cffdac6b22267e757" +SRCREV_glibc = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3" # Makes for a rather long rev (22 characters), but... diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb index 5ebe2503c1..1ef494b086 100644 --- a/meta/recipes-core/glibc/glibc_2.21.bb +++ b/meta/recipes-core/glibc/glibc_2.21.bb @@ -2,10 +2,9 @@ require glibc.inc DEPENDS += "gperf-native kconfig-frontends-native" -SRCREV = "edac0a60c7514b8c9b59488cffdac6b22267e757" +SRCREV = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" -#BRANCH = "release/${PV}/master" -BRANCH = "master" +BRANCH = "release/${PV}/master" SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \ file://IO-acquire-lock-fix.patch \ |