[oe-commits] Martin Jansa : eglibc-scripts: don't package mtrace, RDEPEND on eglibc-mtrace instead, fix RDEPENDS
git at git.openembedded.org
git at git.openembedded.org
Sun Jan 27 13:56:35 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: a3599db48576043d7c335aff677471fc1afed8ab
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a3599db48576043d7c335aff677471fc1afed8ab
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Fri Jan 25 20:42:52 2013 +0100
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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/eglibc/eglibc-scripts.inc | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
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}
More information about the Openembedded-commits
mailing list