From 84d3613d032fa25873143f1236fcdd3ca5ef3bc7 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Mon, 21 Sep 2015 11:29:16 -0700
Subject: [PATCH 1/2] glibc-external: apply Ross Burton's no-bash nscd.init
 patch

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 recipes-external/glibc/glibc-external/nscd.init | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipes-external/glibc/glibc-external/nscd.init b/recipes-external/glibc/glibc-external/nscd.init
index a882da7..b02986e 100644
--- a/recipes-external/glibc/glibc-external/nscd.init
+++ b/recipes-external/glibc/glibc-external/nscd.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # nscd:		Starts the Name Switch Cache Daemon
 #
@@ -49,7 +49,7 @@ prog=nscd
 start () {
     [ -d /var/run/nscd ] || mkdir /var/run/nscd
     [ -d /var/db/nscd ] || mkdir /var/db/nscd
-    echo -n $"Starting $prog: "
+    echo -n "Starting $prog: "
     daemon /usr/sbin/nscd
     RETVAL=$?
     echo
@@ -58,7 +58,7 @@ start () {
 }
 
 stop () {
-    echo -n $"Stopping $prog: "
+    echo -n "Stopping $prog: "
     /usr/sbin/nscd -K
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then
@@ -67,9 +67,9 @@ stop () {
 	# a non-privileged user
 	rm -f /var/run/nscd/nscd.pid
 	rm -f /var/run/nscd/socket
-       	success $"$prog shutdown"
+	success "$prog shutdown"
     else
-       	failure $"$prog shutdown"
+	failure "$prog shutdown"
     fi
     echo
     return $RETVAL
@@ -103,13 +103,13 @@ case "$1" in
 	RETVAL=$?
 	;;
     force-reload | reload)
-    	echo -n $"Reloading $prog: "
+	echo -n "Reloading $prog: "
 	killproc /usr/sbin/nscd -HUP
 	RETVAL=$?
 	echo
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
 	RETVAL=1
 	;;
 esac

From 03d1e185a155ab169166843f9b34d7c6cabff195 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Mon, 21 Sep 2015 14:18:56 -0700
Subject: [PATCH 2/2] glibc-external: avoid bash dep for ldd/tzselect

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 recipes-external/glibc/glibc-external.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index d5242a0..9b19d2b 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -121,6 +121,10 @@ glibc_external_do_install_extra () {
             bbfatal "sed did not fix $locale"
         fi
     done
+
+    # Avoid bash dependency
+    sed -e '1s#bash#sh#; s#$"#"#g' -i "${D}${bindir}/ldd"
+    sed -e '1s#bash#sh#' -i "${D}${bindir}/tzselect"
 }
 
 EXTERNAL_EXTRA_FILES += "\
@@ -209,10 +213,6 @@ FILES_${PN}-dev += "\
 "
 FILES_${PN}-dev[file-checksums] += "${libc_headers_file}"
 
-# Currently, ldd and tzcode from Sourcery G++ still have #!/bin/bash
-RDEPENDS_ldd += "bash"
-RDEPENDS_tzcode += "bash"
-
 # glibc's utils need libgcc
 do_package[depends] += "${MLPREFIX}libgcc:do_packagedata"
 do_package_write_ipk[depends] += "${MLPREFIX}libgcc:do_packagedata"