eglibc-scripts: don't package mtrace, RDEPEND on eglibc-mtrace instead, fix RDEPENDS

* eglibc-mtrace and eglibc-scripts provide the same mtrace script
* remove mtrace from eglibc-scripts and replace it with RDEPENDS
* mtrace also needs perl (eglibc-mtrace has correct RDEPENDS), bash is
  for sotruss and xtrace
* remove invalid RDEPENDS_ldd, ldd is now using /bin/sh and is not
  packaged by eglibc-scripts
* fixes error in world-image build:
  * check_data_file_clashes: Package eglibc-mtrace wants to install file
    rootfs/usr/bin/mtrace
    But that file is already provided by package  * eglibc-scripts

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/eglibc/eglibc-scripts.inc b/meta/recipes-core/eglibc/eglibc-scripts.inc
index a020961f7f4ec9260185289cce2736ea2167e468..9ca66734043cc55d02829b7e76db107580bcd3a2 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-scripts.inc
+++ b/meta/recipes-core/eglibc/eglibc-scripts.inc
@@ -2,12 +2,11 @@ include eglibc-collateral.inc
 
 SUMMARY = "utility scripts provided by eglibc"
 DESCRIPTION = "utility scripts provided by eglibc"
-RDEPENDS_${PN} = "bash"
-RDEPENDS_ldd = "bash"
+RDEPENDS_${PN} = "bash eglibc-mtrace"
 
 SRC = "${STAGING_INCDIR}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}"
 
-bashscripts = "mtrace sotruss xtrace"
+bashscripts = "sotruss xtrace"
 
 do_install() {
        install -d -m 0755 ${D}${bindir}