diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/eglibc | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/eglibc')
| -rw-r--r-- | recipes/eglibc/eglibc.inc | 2 | ||||
| -rw-r--r-- | recipes/eglibc/eglibc_2.11.bb | 4 | ||||
| -rw-r--r-- | recipes/eglibc/eglibc_2.12.bb | 4 | ||||
| -rw-r--r-- | recipes/eglibc/eglibc_svn.bb | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc index c40bc37b5a..66bb90e83f 100644 --- a/recipes/eglibc/eglibc.inc +++ b/recipes/eglibc/eglibc.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -INC_PR = "r10" +INC_PR = "r11" # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb index 26bef4c90e..5d9b8e2d45 100644 --- a/recipes/eglibc/eglibc_2.11.bb +++ b/recipes/eglibc/eglibc_2.11.bb @@ -4,9 +4,9 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" PR_append = "+svnr${SRCPV}" -SRCREV="10454" +SRCREV="10690" EGLIBC_BRANCH="eglibc-2_11" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index a040c76456..a22b2b2fc3 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -4,9 +4,9 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" PR_append = "+svnr${SRCPV}" -SRCREV="10495" +SRCREV="10689" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index bd42030d58..36592c9aba 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,11 +1,11 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "10505" +SRCREV = "10688" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" -PV = "2.11+svnr${SRCPV}" -PR = "${INC_PR}.4" +PV = "2.12+svnr${SRCPV}" +PR = "${INC_PR}.0" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ |