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-20 10:26:12 +0000 |
commit | a574f293fe16612df446d3b7fef71adcab4773e9 (patch) | |
tree | f0930f07d2d32ddf17011f9cb46cd6f04c8077f4 /meta | |
parent | a488fd5b61c473065b35e0871d0a277207fff2db (diff) | |
download | poky-a574f293fe16612df446d3b7fef71adcab4773e9.tar.gz |
glibc: Update to glibc 2.21 release tag
(From OE-Core rev: 530565c6cb77319f4cc49edeea6fec6be997415d)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 | |||
14 | 14 | ||
15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" | 15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" |
16 | 16 | ||
17 | #BRANCH = "release/${PV}/master" | 17 | BRANCH = "release/${PV}/master" |
18 | BRANCH = "master" | ||
19 | 18 | ||
20 | SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH};name=glibc \ | 19 | SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH};name=glibc \ |
21 | git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ | 20 | git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ |
22 | file://fix_for_centos_5.8.patch \ | 21 | file://fix_for_centos_5.8.patch \ |
23 | ${EGLIBCPATCHES} \ | 22 | ${EGLIBCPATCHES} \ |
24 | " | 23 | " |
25 | EGLIBCPATCHES = "\ | 24 | EGLIBCPATCHES = "\ |
@@ -34,7 +33,7 @@ EGLIBCPATCHES = "\ | |||
34 | file://eglibc-use-option-groups.patch \ | 33 | file://eglibc-use-option-groups.patch \ |
35 | " | 34 | " |
36 | 35 | ||
37 | SRCREV_glibc = "edac0a60c7514b8c9b59488cffdac6b22267e757" | 36 | SRCREV_glibc = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" |
38 | SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3" | 37 | SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3" |
39 | 38 | ||
40 | # Makes for a rather long rev (22 characters), but... | 39 | # 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 | |||
2 | 2 | ||
3 | DEPENDS += "gperf-native kconfig-frontends-native" | 3 | DEPENDS += "gperf-native kconfig-frontends-native" |
4 | 4 | ||
5 | SRCREV = "edac0a60c7514b8c9b59488cffdac6b22267e757" | 5 | SRCREV = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" |
6 | 6 | ||
7 | #BRANCH = "release/${PV}/master" | 7 | BRANCH = "release/${PV}/master" |
8 | BRANCH = "master" | ||
9 | 8 | ||
10 | SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \ | 9 | SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \ |
11 | file://IO-acquire-lock-fix.patch \ | 10 | file://IO-acquire-lock-fix.patch \ |