]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc: Delete ldconfig when USE_LDCONFIG is not set
authorKhem Raj <raj.khem@gmail.com>
Fri, 24 Oct 2014 16:24:57 +0000 (09:24 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 31 Dec 2014 10:17:01 +0000 (10:17 +0000)
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>
meta/recipes-core/glibc/glibc-package.inc

index 13209f54c04a22d9e0a2fde6d29c13e1f4586a06..6212e5b38e97a031e094f051b69a34c79989a560 100644 (file)
@@ -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