summaryrefslogtreecommitdiffstats
path: root/meta
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:53:34 +0000
commit584e7ce3abecbfd68da4a58b3fa386210f3c004a (patch)
tree36a96b2910999c0075e57720278d772e69325d7a /meta
parent5298d6f6ff0cc57d2daf56585458ba3c519523cb (diff)
downloadpoky-584e7ce3abecbfd68da4a58b3fa386210f3c004a.tar.gz
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 (From OE-Core rev: f6e0875e35b9149f38f3bbfab6bd7a26048dd689) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 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 () {
80 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace 80 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
81 fi 81 fi
82 rm -rf ${D}${includedir}/rpcsvc/rquota* 82 rm -rf ${D}${includedir}/rpcsvc/rquota*
83 # Info dir listing isn't interesting at this point so remove it if it exists.
84 if [ -e "${D}${infodir}/dir" ]; then
85 rm -f ${D}${infodir}/dir
86 fi
83} 87}
84 88
85do_install_locale () { 89do_install_locale () {