diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-14 18:23:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-11 15:57:08 +0100 |
commit | 1f4f343ff290019987f25d06ea0c00d495660919 (patch) | |
tree | f139bbba8e209a1094a0fc14d446a4e0aba9e9be /meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch | |
parent | 715b05e9e193200c2e41fe4881b2ab1fdb639cc2 (diff) | |
download | poky-1f4f343ff290019987f25d06ea0c00d495660919.tar.gz |
glibc: Upgrade to 2.25.90
Eventually it will be released as 2.26 final
(From OE-Core rev: 5a58883258206893d15990953c8691b05473eecb)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch deleted file mode 100644 index e44be894f6..0000000000 --- a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From c8814875b362efbfd778345d0d2777478bf11a30 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 31 Dec 2015 14:33:02 -0800 | ||
4 | Subject: [PATCH 17/26] Remove bash dependency for nscd init script | ||
5 | |||
6 | The nscd init script uses #! /bin/bash but only really uses one bashism | ||
7 | (translated strings), so remove them and switch the shell to #!/bin/sh. | ||
8 | |||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | Upstream-Status: Inappropriate | ||
12 | --- | ||
13 | nscd/nscd.init | 14 +++++++------- | ||
14 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/nscd/nscd.init b/nscd/nscd.init | ||
17 | index a882da7..b02986e 100644 | ||
18 | --- a/nscd/nscd.init | ||
19 | +++ b/nscd/nscd.init | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/bin/bash | ||
22 | +#!/bin/sh | ||
23 | # | ||
24 | # nscd: Starts the Name Switch Cache Daemon | ||
25 | # | ||
26 | @@ -49,7 +49,7 @@ prog=nscd | ||
27 | start () { | ||
28 | [ -d /var/run/nscd ] || mkdir /var/run/nscd | ||
29 | [ -d /var/db/nscd ] || mkdir /var/db/nscd | ||
30 | - echo -n $"Starting $prog: " | ||
31 | + echo -n "Starting $prog: " | ||
32 | daemon /usr/sbin/nscd | ||
33 | RETVAL=$? | ||
34 | echo | ||
35 | @@ -58,7 +58,7 @@ start () { | ||
36 | } | ||
37 | |||
38 | stop () { | ||
39 | - echo -n $"Stopping $prog: " | ||
40 | + echo -n "Stopping $prog: " | ||
41 | /usr/sbin/nscd -K | ||
42 | RETVAL=$? | ||
43 | if [ $RETVAL -eq 0 ]; then | ||
44 | @@ -67,9 +67,9 @@ stop () { | ||
45 | # a non-privileged user | ||
46 | rm -f /var/run/nscd/nscd.pid | ||
47 | rm -f /var/run/nscd/socket | ||
48 | - success $"$prog shutdown" | ||
49 | + success "$prog shutdown" | ||
50 | else | ||
51 | - failure $"$prog shutdown" | ||
52 | + failure "$prog shutdown" | ||
53 | fi | ||
54 | echo | ||
55 | return $RETVAL | ||
56 | @@ -103,13 +103,13 @@ case "$1" in | ||
57 | RETVAL=$? | ||
58 | ;; | ||
59 | force-reload | reload) | ||
60 | - echo -n $"Reloading $prog: " | ||
61 | + echo -n "Reloading $prog: " | ||
62 | killproc /usr/sbin/nscd -HUP | ||
63 | RETVAL=$? | ||
64 | echo | ||
65 | ;; | ||
66 | *) | ||
67 | - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" | ||
68 | + echo "Usage: $0 {start|stop|status|restart|reload|condrestart}" | ||
69 | RETVAL=1 | ||
70 | ;; | ||
71 | esac | ||
72 | -- | ||
73 | 2.10.2 | ||
74 | |||