From a47b5b92afb708a6b79a568d96219f839e32de55 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 22 Oct 2009 17:30:07 -0700 Subject: eglibc_2.9: Remove un-needed patches. * Update the SRCREV to get latest bugfixes for 2.10 * Update svn recipe to point to latest trunk. Signed-off-by: Khem Raj --- recipes/eglibc/eglibc_2.10.bb | 4 ++-- recipes/eglibc/eglibc_2.9.bb | 3 +-- recipes/eglibc/eglibc_svn.bb | 2 +- recipes/eglibc/files/eglibc_adjust_begin_insertion.patch | 13 ------------- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 recipes/eglibc/files/eglibc_adjust_begin_insertion.patch diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index ec36d926a3..d15bd61268 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,8 +3,8 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.1" -SVN_REV="8873" +PR = "${INC_PR}.2" +SVN_REV="9124" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index cf9549c7a7..bc1b04133f 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,12 +3,11 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ - file://eglibc_adjust_begin_insertion.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 454cfd2e37..f652c61b96 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "9029" +SRCREV = "9123" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.10+svnr${SRCREV}" diff --git a/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch b/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch deleted file mode 100644 index 8f05cc0cab..0000000000 --- a/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libc/elf/Makefile -=================================================================== ---- libc.orig/elf/Makefile 2009-07-15 14:37:34.000000000 -0700 -+++ libc/elf/Makefile 2009-07-15 14:37:47.000000000 -0700 -@@ -305,7 +305,7 @@ - $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ - LC_ALL=C \ - sed -e '/^=========/,/^=========/!d;/^=========/d' \ -- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ -+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ - > $@.lds - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ - $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ -- cgit 1.2.3-korg