summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-15 16:31:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 10:59:32 (GMT)
commit7412611252c280c7620470650b3529bae53ab351 (patch)
tree0f59bda976d9c187d9b6211f4e0f0ce2b5d171ec /meta/recipes-core
parent026d502b2a8aed05120a93d4d2917b9da2c16880 (diff)
downloadpoky-7412611252c280c7620470650b3529bae53ab351.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: 6f78625dbab5c81ef20b197aee5206f63611b673) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc7
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/tasks/task-core-tools-debug.bb4
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 0db221f..3c371a7 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1"
20PKGSUFFIX = "" 20PKGSUFFIX = ""
21PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 21PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
22 22
23PACKAGES = "${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}" 23PACKAGES = "${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
26RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" 26RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)"
27RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" 27RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
28RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace"
28RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" 29RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"
29RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" 30RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev"
30RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" 31RPROVIDES_${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"
49FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" 50FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
50FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" 51FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
52FILES_${PN}-mtrace = "${bindir}/mtrace"
51FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" 53FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
52FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" 54FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
53FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" 55FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv"
54RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" 56RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
55RDEPENDS_${PN}-utils += "bash" 57RDEPENDS_${PN}-utils += "bash"
58RDEPENDS_${PN}-mtrace += "perl"
56FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" 59FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
57FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" 60FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
58RPROVIDES_${PN}-dev += "libc-dev" 61RPROVIDES_${PN}-dev += "libc-dev"
@@ -68,6 +71,8 @@ SUMMARY_ldd = "print shared library dependencies"
68DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." 71DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line."
69SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" 72SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc"
70DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." 73DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..."
74SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc"
75DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc"
71DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" 76DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
72 77
73inherit libc-common multilib_header 78inherit 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 d8a41dc..73cd0aa 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
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r26" 6PR = "r27"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_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 3c92f3f..1dddbb8 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
18ALLOW_EMPTY = "1" 18ALLOW_EMPTY = "1"
19 19
20MTRACE = ""
21MTRACE_libc-glibc = "libc-mtrace"
22
20RDEPENDS_${PN} = "\ 23RDEPENDS_${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 "