]> code.ossystems Code Review - openembedded-core.git/commitdiff
eglibc-package: remove infodir/dir if it exists
authorMartin Jansa <martin.jansa@gmail.com>
Fri, 25 Jan 2013 19:42:53 +0000 (20:42 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 27 Jan 2013 13:48:22 +0000 (13:48 +0000)
* 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>
meta/recipes-core/eglibc/eglibc-package.inc

index 79c43f15becac2534e2bbf5a7b845d6212d0dd0b..dae5d4f0157d713705ded573c155bfaf06567e74 100644 (file)
@@ -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 () {