summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-01-25 20:42:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-27 13:53:34 +0000
commit1ae72ff8095b1d63249dcab8eefe653567d69429 (patch)
treec7f12c1882f1389f770aca262bdb06a5573d98b4
parent584e7ce3abecbfd68da4a58b3fa386210f3c004a (diff)
downloadpoky-1ae72ff8095b1d63249dcab8eefe653567d69429.tar.gz
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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/eglibc-scripts.inc5
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 a020961f7f..9ca6673404 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
2 2
3SUMMARY = "utility scripts provided by eglibc" 3SUMMARY = "utility scripts provided by eglibc"
4DESCRIPTION = "utility scripts provided by eglibc" 4DESCRIPTION = "utility scripts provided by eglibc"
5RDEPENDS_${PN} = "bash" 5RDEPENDS_${PN} = "bash eglibc-mtrace"
6RDEPENDS_ldd = "bash"
7 6
8SRC = "${STAGING_INCDIR}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}" 7SRC = "${STAGING_INCDIR}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}"
9 8
10bashscripts = "mtrace sotruss xtrace" 9bashscripts = "sotruss xtrace"
11 10
12do_install() { 11do_install() {
13 install -d -m 0755 ${D}${bindir} 12 install -d -m 0755 ${D}${bindir}