[OE-core] [PATCH] eglibc: Avoid "installed but not shipped" warning for ld.so.conf
Phil Blundell
pb at pbcl.net
Wed Apr 24 16:39:59 UTC 2013
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>
---
meta/recipes-core/eglibc/eglibc-package.inc | 10 ++++++++++
1 file changed, 10 insertions(+)
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 () {
--
1.7.10.4
More information about the Openembedded-core
mailing list