[oe-commits] Khem Raj : glibc: Delete ldconfig when USE_LDCONFIG is not set
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 24 21:00:23 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 5a674a0af1859ec0cfeb29ef4d76530edd8d21dc
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5a674a0af1859ec0cfeb29ef4d76530edd8d21dc
Author: Khem Raj <raj.khem at gmail.com>
Date: Fri Oct 24 09:24:57 2014 -0700
glibc: Delete ldconfig when USE_LDCONFIG is not set
This avoids below QA error/warning
/sbin/ldconfig [installed-vs-shipped]
Change-Id: I028b692eefeaa6e0e0e6507ab4108caa29e41e91
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/glibc/glibc-package.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 13209f5..6212e5b 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
More information about the Openembedded-commits
mailing list