From: Phil Blundell <pb@pbcl.net>
Date: Wed, 24 Apr 2013 16:39:59 +0000 (+0100)
Subject: eglibc: Avoid "installed but not shipped" warning for ld.so.conf
X-Git-Tag: 2015-4~6707
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=23b5dd2ab8a556fcef3aa34689310d9d5f61b3d1;p=openembedded-core.git

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@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 88a00a49a8..f144273c19 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 () {