[oe-commits] Phil Blundell : eglibc: Avoid "installed but not shipped" warning for ld.so .conf

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 23b5dd2ab8a556fcef3aa34689310d9d5f61b3d1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=23b5dd2ab8a556fcef3aa34689310d9d5f61b3d1

Author: Phil Blundell <pb at pbcl.net>
Date:   Wed Apr 24 17:39:59 2013 +0100

eglibc: Avoid "installed but not shipped" warning for ld.so.conf

If USE_LDCONFIG is not set then we won't ship ld.so.conf.  However,
eglibc still installs it which leads to a QA warning.  Prevent that by
removing the file (and the subsequently-empty directory /etc) in this
situation.

Signed-off-by: Phil Blundell <philb at gnu.org>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-core/eglibc/eglibc-package.inc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 88a00a4..f144273 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -84,6 +84,16 @@ do_install_append () {
 	if [ -e "${D}${infodir}/dir" ]; then
 		rm -f ${D}${infodir}/dir
 	fi
+
+	if [ "${USE_LDCONFIG}" != "1" ]; then
+		# We won't ship this file (see FILES above) so let's not install it
+		rm -f ${D}${sysconfdir}/ld.so.conf
+		# This directory will be empty now so remove it too.
+		# But check whether it exists first, since it won't for eglibc-initial.
+		if [ -d ${D}${sysconfdir} ]; then
+			rmdir ${D}${sysconfdir}
+		fi
+	fi
 }
 
 do_install_locale () {