Patchwork [5/7] eglibc-scripts: don't package mtrace, RDEPEND on eglibc-mtrace instead, fix RDEPENDS

login
register
mail settings
Submitter Martin Jansa
Date Jan. 25, 2013, 7:42 p.m.
Message ID <be5af0856eca4f864731dd10456445a3d3979d0f.1359142768.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43417/
State Accepted, archived
Headers show

Comments

Martin Jansa - Jan. 25, 2013, 7:42 p.m.
* 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>
---
 meta/recipes-core/eglibc/eglibc-scripts.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-scripts.inc b/meta/recipes-core/eglibc/eglibc-scripts.inc
index a020961..9ca6673 100644
--- 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}