From: Martin Jansa Date: Fri, 25 Jan 2013 19:42:52 +0000 (+0100) Subject: eglibc-scripts: don't package mtrace, RDEPEND on eglibc-mtrace instead, fix RDEPENDS X-Git-Tag: rev_ivi_2015_02_04~14052 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0af37ec4f8d5216e5cc1eca007ea2a237978c3b;p=scm%2Fbb%2Ftizen-distro.git 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 (From OE-Core rev: a3599db48576043d7c335aff677471fc1afed8ab) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- 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}