diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-14 20:20:49 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-14 20:20:49 +0100 |
| commit | 8f96edfb16e593264a49b04eade98d4e2094d1b1 (patch) | |
| tree | 5e3be2cff727d6fefa8080b67ec3c2beb13e99cc /meta/packages/glibc/glibc-2.9 | |
| parent | 48a278ed71306f633091ed81d170eeff45ba3759 (diff) | |
| download | poky-8f96edfb16e593264a49b04eade98d4e2094d1b1.tar.gz | |
glibc-2.9: Sync with OE.dev and update patchset
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/glibc/glibc-2.9')
| -rw-r--r-- | meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch | 28 | ||||
| -rw-r--r-- | meta/packages/glibc/glibc-2.9/nscd-init.patch | 39 | ||||
| -rw-r--r-- | meta/packages/glibc/glibc-2.9/rulesfix.patch | 13 |
3 files changed, 80 insertions, 0 deletions
diff --git a/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch b/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch new file mode 100644 index 0000000000..8d36a0524e --- /dev/null +++ b/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ulrich Drepper <drepper@redhat.com> | ||
| 3 | Date: Sat, 31 Jan 2009 00:21:15 +0000 | ||
| 4 | Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to newer linker scripts. | ||
| 5 | --- | ||
| 6 | diff --git a/elf/Makefile b/elf/Makefile | ||
| 7 | index 8079fe9..e44ff1d 100644 | ||
| 8 | --- a/elf/Makefile | ||
| 9 | +++ b/elf/Makefile | ||
| 10 | @@ -1,4 +1,4 @@ | ||
| 11 | -# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc. | ||
| 12 | +# Copyright (C) 1995-2007, 2008, 2009 Free Software Foundation, Inc. | ||
| 13 | # This file is part of the GNU C Library. | ||
| 14 | |||
| 15 | # The GNU C Library is free software; you can redistribute it and/or | ||
| 16 | @@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) | ||
| 17 | $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ | ||
| 18 | LC_ALL=C \ | ||
| 19 | sed -e '/^=========/,/^=========/!d;/^=========/d' \ | ||
| 20 | - -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ | ||
| 21 | + -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ | ||
| 22 | > $@.lds | ||
| 23 | $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ | ||
| 24 | $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ | ||
| 25 | -- | ||
| 26 | 1.6.3.2 | ||
| 27 | |||
| 28 | |||
diff --git a/meta/packages/glibc/glibc-2.9/nscd-init.patch b/meta/packages/glibc/glibc-2.9/nscd-init.patch new file mode 100644 index 0000000000..884609a5a3 --- /dev/null +++ b/meta/packages/glibc/glibc-2.9/nscd-init.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | --- nscd/nscd.init | ||
| 2 | +++ nscd/nscd.init | ||
| 3 | @@ -48,9 +48,8 @@ | ||
| 4 | |||
| 5 | start () { | ||
| 6 | [ -d /var/run/nscd ] || mkdir /var/run/nscd | ||
| 7 | - [ -d /var/db/nscd ] || mkdir /var/db/nscd | ||
| 8 | echo -n $"Starting $prog: " | ||
| 9 | - daemon /usr/sbin/nscd | ||
| 10 | + /usr/sbin/nscd | ||
| 11 | RETVAL=$? | ||
| 12 | echo | ||
| 13 | [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd | ||
| 14 | @@ -67,12 +66,10 @@ | ||
| 15 | # a non-privileged user | ||
| 16 | rm -f /var/run/nscd/nscd.pid | ||
| 17 | rm -f /var/run/nscd/socket | ||
| 18 | - success $"$prog shutdown" | ||
| 19 | - else | ||
| 20 | - failure $"$prog shutdown" | ||
| 21 | fi | ||
| 22 | - echo | ||
| 23 | - return $RETVAL | ||
| 24 | + echo "Done." | ||
| 25 | + # If nscd did not run, return 0 according to LSB. | ||
| 26 | + return 0 | ||
| 27 | } | ||
| 28 | |||
| 29 | restart() { | ||
| 30 | @@ -104,7 +101,8 @@ | ||
| 31 | ;; | ||
| 32 | force-reload | reload) | ||
| 33 | echo -n $"Reloading $prog: " | ||
| 34 | - killproc /usr/sbin/nscd -HUP | ||
| 35 | + # Use killall, initscripts-1.0-r115 don't support -HUP yet. | ||
| 36 | + killall -HUP /usr/sbin/nscd | ||
| 37 | RETVAL=$? | ||
| 38 | echo | ||
| 39 | ;; | ||
diff --git a/meta/packages/glibc/glibc-2.9/rulesfix.patch b/meta/packages/glibc/glibc-2.9/rulesfix.patch new file mode 100644 index 0000000000..67bfc9467d --- /dev/null +++ b/meta/packages/glibc/glibc-2.9/rulesfix.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | Index: glibc-2.9/Makerules | ||
| 2 | =================================================================== | ||
| 3 | --- glibc-2.9.orig/Makerules 2009-09-14 16:39:21.000000000 +0100 | ||
| 4 | +++ glibc-2.9/Makerules 2009-09-14 16:39:50.000000000 +0100 | ||
| 5 | @@ -173,6 +173,8 @@ | ||
| 6 | # it's used in sysd-rules, below. | ||
| 7 | $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \ | ||
| 8 | %.sym $(common-before-compile) | ||
| 9 | + rm -f $(@:.h=.h.d) | ||
| 10 | + rm -f $(@:.h.d=.h) | ||
| 11 | $(AWK) -f $< $(filter %.sym,$^) \ | ||
| 12 | | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \ | ||
| 13 | -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)' | ||
