[oe-commits] Martin Jansa : eglibc-package: remove infodir/dir if it exists
git at git.openembedded.org
git at git.openembedded.org
Sun Jan 27 13:56:34 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: f6e0875e35b9149f38f3bbfab6bd7a26048dd689
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f6e0875e35b9149f38f3bbfab6bd7a26048dd689
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Fri Jan 25 20:42:53 2013 +0100
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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/eglibc/eglibc-package.inc | 4 ++++
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 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 () {
More information about the Openembedded-commits
mailing list