diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-15 09:31:32 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-24 08:51:37 +0100 |
commit | 76e1d4a7ac18478bb0cbb852f4a844b5e6793c0c (patch) | |
tree | 169b0f7c4bbed7a5c798a4f8f3f8faf9ce7498c8 | |
parent | bb4f829965682f7879883dbf788ea03954b13bb5 (diff) | |
download | poky-76e1d4a7ac18478bb0cbb852f4a844b5e6793c0c.tar.gz |
eglibc: package mtrace separately
add libc-mtrace as dependency for task-core-tools-debug
now eglibc-mtrace gets included in an sdk image and not in a non-sdk image.
This does not affect builds with uclibc.
This fixes bug: [YOCTO# 2374]
(From OE-Core rev: a2ad2870a54108027ed33e977470f5f72e0bce1b)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 7 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-tools-debug.bb | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 7d975671da..ce37155ce2 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" | |||
20 | PKGSUFFIX = "" | 20 | PKGSUFFIX = "" |
21 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 21 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
22 | 22 | ||
23 | PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" | 23 | PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" |
24 | 24 | ||
25 | # The ld.so in this eglibc supports the GNU_HASH | 25 | # The ld.so in this eglibc supports the GNU_HASH |
26 | RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" | 26 | RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" |
27 | RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" | 27 | RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" |
28 | RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" | ||
28 | RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" | 29 | RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" |
29 | RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" | 30 | RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" |
30 | RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" | 31 | RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" |
@@ -48,11 +49,13 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ | |||
48 | ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 49 | ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" |
49 | FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" | 50 | FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" |
50 | FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" | 51 | FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" |
52 | FILES_${PN}-mtrace = "${bindir}/mtrace" | ||
51 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" | 53 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" |
52 | FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" | 54 | FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" |
53 | FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" | 55 | FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" |
54 | RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" | 56 | RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" |
55 | RDEPENDS_${PN}-utils += "bash" | 57 | RDEPENDS_${PN}-utils += "bash" |
58 | RDEPENDS_${PN}-mtrace += "perl" | ||
56 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 59 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
57 | FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" | 60 | FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" |
58 | RPROVIDES_${PN}-dev += "libc-dev" | 61 | RPROVIDES_${PN}-dev += "libc-dev" |
@@ -68,6 +71,8 @@ SUMMARY_ldd = "print shared library dependencies" | |||
68 | DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." | 71 | DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." |
69 | SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" | 72 | SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" |
70 | DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." | 73 | DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." |
74 | SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" | ||
75 | DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" | ||
71 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" | 76 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" |
72 | 77 | ||
73 | inherit libc-common multilib_header | 78 | inherit libc-common multilib_header |
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index d8a41dc435..73cd0aaaed 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -3,7 +3,7 @@ require eglibc.inc | |||
3 | SRCREV = "15508" | 3 | SRCREV = "15508" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r26" | 6 | PR = "r27" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_13" | 9 | EGLIBC_BRANCH="eglibc-2_13" |
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb index 3c92f3f8f3..1dddbb8379 100644 --- a/meta/recipes-core/tasks/task-core-tools-debug.bb +++ b/meta/recipes-core/tasks/task-core-tools-debug.bb | |||
@@ -17,10 +17,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
17 | 17 | ||
18 | ALLOW_EMPTY = "1" | 18 | ALLOW_EMPTY = "1" |
19 | 19 | ||
20 | MTRACE = "" | ||
21 | MTRACE_libc-glibc = "libc-mtrace" | ||
22 | |||
20 | RDEPENDS_${PN} = "\ | 23 | RDEPENDS_${PN} = "\ |
21 | gdb \ | 24 | gdb \ |
22 | gdbserver \ | 25 | gdbserver \ |
23 | tcf-agent \ | 26 | tcf-agent \ |
24 | rsync \ | 27 | rsync \ |
25 | strace \ | 28 | strace \ |
29 | ${MTRACE} \ | ||
26 | " | 30 | " |