Skip to contentSkip to conversation

glibc: Incremental bump to 2.20 release branch

PATCH New Khem Raj 1 participant 1 message Sep 9, 2014

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 glibc: Incremental bump to 2.20 release branch

Now that glibc 2.20 has been released. We switch to use release branch and remove the already applied patch

---
 .../glibc/cross-localedef-native_2.20.bb           |    4 +-
 .../0001-Define-__GI_fegetenv-for-e500-libm.patch  |   45 --------------------
 meta/recipes-core/glibc/glibc_2.20.bb              |    5 +--
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch
meta/recipes-core/glibc/cross-localedef-native_2.20.bb +2 -2
index fd8c242..ccf56a9 100644
@@ -16,7 +16,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 
 PV = "2.20"
 
-SRC_URI = "git://sourceware.org/git/glibc.git;branch=master;name=glibc \
+SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master;name=glibc \
            git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
 	   file://fix_for_centos_5.8.patch \
            ${EGLIBCPATCHES} \
@@ -33,7 +33,7 @@ EGLIBCPATCHES = "\
            file://eglibc-use-option-groups.patch \
           "
 
-SRCREV_glibc = "529bf51595fffbe80023e7d895b671391991bb1b"
+SRCREV_glibc = "b8079dd0d360648e4e8de48656c5c38972621072"
 SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
 
 S = "${WORKDIR}/git"
meta/recipes-core/glibc/glibc/0001-Define-__GI_fegetenv-for-e500-libm.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-core/glibc/glibc_2.20.bb +2 -3
index c6ef34a..30a4397 100644
@@ -4,9 +4,9 @@ DEPENDS += "gperf-native kconfig-frontends-native"
 
 PV = "2.20"
 
-SRCREV = "529bf51595fffbe80023e7d895b671391991bb1b"
+SRCREV = "b8079dd0d360648e4e8de48656c5c38972621072"
 
-SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \
+SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master \
            file://IO-acquire-lock-fix.patch \
            file://mips-rld-map-check.patch \
            file://etc/ld.so.conf \
@@ -23,7 +23,6 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=master \
            file://ppce6500-32b_slow_ieee754_sqrt.patch \
            file://grok_gold.patch \
            file://fix_am_rootsbindir.patch \
-           file://0001-Define-__GI_fegetenv-for-e500-libm.patch \
            ${EGLIBCPATCHES} \
           "
 EGLIBCPATCHES = "\
Signature · 1 line
1.7.10.4