From b32666e29999c7c698b1a1378f96844fbc48358d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Jun 2011 23:48:01 +0100 Subject: [PATCH] Revert "eglibc: Upgrade recipes from 2.13 -> 2.14" This reverts commit 2a68cf4d315cdd18766de0c75928ff17846a6cd7. 2.14 isn't ready for prime time :( (A load of files no longer seem to get installed for example) --- ...ledef-native_2.14.bb => cross-localedef-native_2.13.bb} | 0 .../{eglibc-2.14 => eglibc-2.13}/IO-acquire-lock-fix.patch | 0 .../eglibc-svn-arm-lowlevellock-include-tls.patch | 0 .../eglibc/{eglibc-2.14 => eglibc-2.13}/etc/ld.so.conf | 0 .../{eglibc-2.14 => eglibc-2.13}/generate-supported.mk | 0 .../{eglibc-2.14 => eglibc-2.13}/ld-search-order.patch | 0 .../{eglibc-2.14 => eglibc-2.13}/mips-rld-map-check.patch | 0 .../shorten-build-commands.patch | 0 .../stack-protector-test.patch | 0 .../{eglibc-initial_2.14.bb => eglibc-initial_2.13.bb} | 0 .../recipes-core/eglibc/{eglibc_2.14.bb => eglibc_2.13.bb} | 7 ++++--- 11 files changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-core/eglibc/{cross-localedef-native_2.14.bb => cross-localedef-native_2.13.bb} (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/IO-acquire-lock-fix.patch (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/eglibc-svn-arm-lowlevellock-include-tls.patch (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/etc/ld.so.conf (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/generate-supported.mk (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/ld-search-order.patch (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/mips-rld-map-check.patch (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/shorten-build-commands.patch (100%) rename meta/recipes-core/eglibc/{eglibc-2.14 => eglibc-2.13}/stack-protector-test.patch (100%) rename meta/recipes-core/eglibc/{eglibc-initial_2.14.bb => eglibc-initial_2.13.bb} (100%) rename meta/recipes-core/eglibc/{eglibc_2.14.bb => eglibc_2.13.bb} (97%) diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.14.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.13.bb similarity index 100% rename from meta/recipes-core/eglibc/cross-localedef-native_2.14.bb rename to meta/recipes-core/eglibc/cross-localedef-native_2.13.bb diff --git a/meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch rename to meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch rename to meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf rename to meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf diff --git a/meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk rename to meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk diff --git a/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch rename to meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch rename to meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch rename to meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch similarity index 100% rename from meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch rename to meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.14.bb b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb similarity index 100% rename from meta/recipes-core/eglibc/eglibc-initial_2.14.bb rename to meta/recipes-core/eglibc/eglibc-initial_2.13.bb diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb similarity index 97% rename from meta/recipes-core/eglibc/eglibc_2.14.bb rename to meta/recipes-core/eglibc/eglibc_2.13.bb index 8936d9ca91..3490d2db9f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.14.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -1,12 +1,13 @@ require eglibc.inc -SRCREV = "14285" +SRCREV = "14157" DEPENDS += "gperf-native" -PR = "r0" +FILESPATHPKG =. "eglibc-svn:" +PR = "r2" PR_append = "+svnr${SRCPV}" -EGLIBC_BRANCH="eglibc-2_14" +EGLIBC_BRANCH="eglibc-2_13" SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ file://IO-acquire-lock-fix.patch \ -- 2.40.1