aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-01-25 20:42:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-27 13:48:22 +0000
commitf6e0875e35b9149f38f3bbfab6bd7a26048dd689 (patch)
tree7e9bc39619af3e0b448c53f3ce4e8248ac4b7db2 /meta/recipes-core/eglibc
parent0b8fe539928c7a61ca01a4a0a0f54df47164ac6c (diff)
downloadopenembedded-core-contrib-f6e0875e35b9149f38f3bbfab6bd7a26048dd689.tar.gz
openembedded-core-contrib-f6e0875e35b9149f38f3bbfab6bd7a26048dd689.tar.bz2
openembedded-core-contrib-f6e0875e35b9149f38f3bbfab6bd7a26048dd689.zip
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>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 79c43f15bec..dae5d4f0157 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 () {