From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 24 Oct 2014 16:24:57 +0000 (-0700)
Subject: glibc: Delete ldconfig when USE_LDCONFIG is not set
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=267dc0429e8da7cc292034e1a5ab3eae7786db4e;p=openembedded-core.git

glibc: Delete ldconfig when USE_LDCONFIG is not set

This avoids below QA error/warning
/sbin/ldconfig [installed-vs-shipped]

Change-Id: I028b692eefeaa6e0e0e6507ab4108caa29e41e91
(From OE-Core rev: 2b499db19cd9bd14292457716b50dc62ed90515d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 13209f54c0..6212e5b38e 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -92,8 +92,9 @@ do_install_append () {
 	fi
 
 	if [ "${USE_LDCONFIG}" != "1" ]; then
-		# We won't ship this file (see FILES above) so let's not install it
+		# We won't ship these files (see FILES above) so let's not install them
 		rm -f ${D}${sysconfdir}/ld.so.conf
+		rm -f ${D}${base_sbindir}/ldconfig
 		# This directory will be empty now so remove it too.
 		# But check whether it exists first, since it won't for glibc-initial.
 		if [ -d ${D}${sysconfdir} ]; then