From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 25 Jan 2013 19:42:53 +0000 (+0100)
Subject: eglibc-package: remove infodir/dir if it exists
X-Git-Tag: 2015-4~7862
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f6e0875e35b9149f38f3bbfab6bd7a26048dd689;p=openembedded-core.git

eglibc-package: remove infodir/dir if it exists

* fixes error in world-image build:
 * check_data_file_clashes: Package eglibc-doc wants to install file
   rootfs/usr/share/info/dir
   But that file is already provided by package  * gcc-doc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 79c43f15be..dae5d4f015 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -80,6 +80,10 @@ do_install_append () {
 		sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
 	fi
 	rm -rf ${D}${includedir}/rpcsvc/rquota*
+	# Info dir listing isn't interesting at this point so remove it if it exists.
+	if [ -e "${D}${infodir}/dir" ]; then
+		rm -f ${D}${infodir}/dir
+	fi
 }
 
 do_install_locale () {