diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2013-01-25 20:42:52 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-27 13:49:07 +0000 |
| commit | a3599db48576043d7c335aff677471fc1afed8ab (patch) | |
| tree | 647d88241f79698b8931f88868f440637bb613cf /meta/recipes-core | |
| parent | f6e0875e35b9149f38f3bbfab6bd7a26048dd689 (diff) | |
| download | openembedded-core-contrib-a3599db48576043d7c335aff677471fc1afed8ab.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | 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 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 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} |