1 files changed, 8 insertions, 8 deletions

diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
index d56e42fdf8..24b07163e1 100644
--- a/meta/packages/glibc/glibc_2.9.bb
+++ b/meta/packages/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r0"
+PR = "r1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -42,8 +42,9 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 #          file://arm-ioperm.patch;patch=1;pnum=0 \
 #          file://ldd.patch;patch=1;pnum=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
-           ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2 \
+           ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
            ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+           file://nscd-init.patch;patch=1;pnum=0 \
            file://arm-memcpy.patch;patch=1 \
            file://arm-longlong.patch;patch=1 \
            file://fhs-linux-paths.patch;patch=1 \
@@ -53,9 +54,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            file://glibc-check_pf.patch;patch=1;pnum=0 \
            file://ldd-unbash.patch;patch=1 \
            file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
-           file://local-args6.diff;patch=1 \
-           file://arm-check-pf.patch;patch=1 \
-           file://arm-lowlevellock-include-tls.patch;patch=1 \
            file://generic-bits_select.h \
            file://generic-bits_types.h \
            file://generic-bits_typesizes.h \
@@ -64,10 +62,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            file://generate-supported.mk \
            file://march-i686.patch;patch=1;pnum=0 \
            file://tls_i486.patch;patch=1 \
-           file://glibc-arm-no-asm-page.patch;patch=1 \
+           file://rulesfix.patch;patch=1 \
+           file://glibc-2.9-use-_begin.patch;patch=1 \
            "
 
-
 # Build fails on sh3 and sh4 without additional patches
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
@@ -90,7 +88,7 @@ EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
 
 do_munge() {
         # Integrate ports and libidn into tree
-        mv ${WORKDIR}/glibc-ports-2.7 ${S}/ports
+        mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
         mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
 
         # Ports isn't really working... Fix it
@@ -124,6 +122,8 @@ addtask munge before do_patch after do_unpack
 
 
 do_configure () {
+# /var/db was not included to FHS
+        sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
 # don't pass CPPFLAGS into configure, since it upsets the kernel-headers