summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-07 15:09:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-08 09:17:49 +0100
commit392c117e7ab05da10a374f695d5232e7527ab5de (patch)
tree96acdc69cdc0815a3b820101ba14225ae466535d /meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
parent470c58ba4586082de802759686460222cc04336d (diff)
downloadpoky-392c117e7ab05da10a374f695d5232e7527ab5de.tar.gz
glibc: Upgrade to 2.32 release
Drop 0001-localedef-Add-hardlink-resolver-to-build.patch as its applied to localedef upstream Drop CVE patches which are already part of 2.32 release Drop unused attribute patch as its fixed differently in 2.32 Add a patch to mitigate the sideffect of [1] for ppc which detect wrong cpu in OE since we are cross compiling [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=146fea07640387c78e334933de24b6353e1f0eba (From OE-Core rev: fe3d5136ef02721f9bbe01d98c1743b8dbcb69c5) 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.patch75
1 files changed, 75 insertions, 0 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
new file mode 100644
index 0000000000..57907fe660
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
@@ -0,0 +1,75 @@
1From dac46c07736a799fc82be03aa546b2d24c19ad78 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 14:33:02 -0800
4Subject: [PATCH 17/29] Remove bash dependency for nscd init script
5
6The 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
9Upstream-Status: Pending
10
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 nscd/nscd.init | 14 +++++++-------
15 1 file changed, 7 insertions(+), 7 deletions(-)
16
17diff --git a/nscd/nscd.init b/nscd/nscd.init
18index a882da7d8b..b02986ec15 100644
19--- a/nscd/nscd.init
20+++ b/nscd/nscd.init
21@@ -1,4 +1,4 @@
22-#!/bin/bash
23+#!/bin/sh
24 #
25 # nscd: Starts the Name Switch Cache Daemon
26 #
27@@ -49,7 +49,7 @@ prog=nscd
28 start () {
29 [ -d /var/run/nscd ] || mkdir /var/run/nscd
30 [ -d /var/db/nscd ] || mkdir /var/db/nscd
31- echo -n $"Starting $prog: "
32+ echo -n "Starting $prog: "
33 daemon /usr/sbin/nscd
34 RETVAL=$?
35 echo
36@@ -58,7 +58,7 @@ start () {
37 }
38
39 stop () {
40- echo -n $"Stopping $prog: "
41+ echo -n "Stopping $prog: "
42 /usr/sbin/nscd -K
43 RETVAL=$?
44 if [ $RETVAL -eq 0 ]; then
45@@ -67,9 +67,9 @@ stop () {
46 # a non-privileged user
47 rm -f /var/run/nscd/nscd.pid
48 rm -f /var/run/nscd/socket
49- success $"$prog shutdown"
50+ success "$prog shutdown"
51 else
52- failure $"$prog shutdown"
53+ failure "$prog shutdown"
54 fi
55 echo
56 return $RETVAL
57@@ -103,13 +103,13 @@ case "$1" in
58 RETVAL=$?
59 ;;
60 force-reload | reload)
61- echo -n $"Reloading $prog: "
62+ echo -n "Reloading $prog: "
63 killproc /usr/sbin/nscd -HUP
64 RETVAL=$?
65 echo
66 ;;
67 *)
68- echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
69+ echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
70 RETVAL=1
71 ;;
72 esac
73--
742.27.0
75