Patchwork [6/7] eglibc-package: remove infodir/dir if it exists

login
register
mail settings
Submitter Martin Jansa
Date Jan. 25, 2013, 7:42 p.m.
Message ID <79eb34363a39748424f11dc9bda127fb42624516.1359142768.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43419/
State Accepted
Commit 584e7ce3abecbfd68da4a58b3fa386210f3c004a
Headers show

Comments

Martin Jansa - Jan. 25, 2013, 7:42 p.m.
* 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>
---
 meta/recipes-core/eglibc/eglibc-package.inc | 4 ++++
 1 file changed, 4 insertions(+)

Patch

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