Misc fixes
cover Misc fixes
From: Nitin A Kamble <[email protected]>
The following changes since commit b7c1ac86909b1479434048c3e1d013d6efd9eac8:
Revert "kmod: Use base_libdir for installing libkmod" (2012-05-17 21:13:11 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/work
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/work
Nitin A Kamble (1):
eglibc: package mtrace separately
meta/recipes-core/eglibc/eglibc-package.inc | 7 ++++++- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- meta/recipes-core/tasks/task-core-tools-debug.bb | 1 + meta/recipes-core/uclibc/uclibc.inc | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.7
PATCH 1/1 eglibc: package mtrace separately
From: Nitin A Kamble <[email protected]>
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.
make uclibc recipe lie about providing libc-mtrace to satisfy the dependency
This fixes bug: [YOCTO# 2374]
--- meta/recipes-core/eglibc/eglibc-package.inc | 7 ++++++- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- meta/recipes-core/tasks/task-core-tools-debug.bb | 1 + meta/recipes-core/uclibc/uclibc.inc | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-)
meta/recipes-core/eglibc/eglibc-package.inc +6 -1
@@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -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}" +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}" # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" +RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev"
@@ -48,11 +49,13 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_${PN}-utils += "bash" +RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_${PN}-dev += "libc-dev"
@@ -68,6 +71,8 @@ SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." +SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" +DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" inherit libc-common multilib_header
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "15508" DEPENDS += "gperf-native" -PR = "r26" +PR = "r27" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "17386" DEPENDS += "gperf-native" -PR = "r10" +PR = "r11" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_15"
meta/recipes-core/tasks/task-core-tools-debug.bb +1 -0
@@ -23,4 +23,5 @@ RDEPENDS_${PN} = "\ tcf-agent \ rsync \ strace \ + libc-mtrace \ "
meta/recipes-core/uclibc/uclibc.inc +1 -1
@@ -89,7 +89,7 @@ RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # going to work. So we pretend that we have it to make bitbake not pull other recipes # to satisfy this dependency for the images/tasks -RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH)" +RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH) libc-mtrace" SRC_URI = "\ http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \
Signature · 1 line
1.7.7
Re: [PATCH 1/1] eglibc: package mtrace separately
Quoted 91 lines · On 05/18/2012 02:07 AM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
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.
make uclibc recipe lie about providing libc-mtrace to satisfy the dependency
This fixes bug: [YOCTO# 2374]
Signed-off-by Nitin A Kamble<[email protected]>--- meta/recipes-core/eglibc/eglibc-package.inc | 7 ++++++- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- meta/recipes-core/tasks/task-core-tools-debug.bb | 1 + meta/recipes-core/uclibc/uclibc.inc | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-)meta/recipes-core/eglibc/eglibc-package.inc +6
-1@@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -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}" +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}" # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" +RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev"@@ -48,11 +49,13 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_${PN}-utils += "bash" +RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_${PN}-dev += "libc-dev"@@ -68,6 +71,8 @@ SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." +SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" +DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" inherit libc-common multilib_headermeta/recipes-core/eglibc/eglibc_2.13.bb +1
-1@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "15508" DEPENDS += "gperf-native" -PR = "r26" +PR = "r27" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"meta/recipes-core/eglibc/eglibc_2.15.bb +1
-1@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "17386" DEPENDS += "gperf-native" -PR = "r10" +PR = "r11" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_15"meta/recipes-core/tasks/task-core-tools-debug.bb +0
-0
meta/recipes-core/tasks/task-core-tools-debug.bb RDEPENDS_${PN} = "\ · line 27
Quoted 5 lines
meta/recipes-core/tasks/task-core-tools-debug.bb +1
-0@@ -23,4 +23,5 @@ RDEPENDS_${PN} = "\ tcf-agent \ rsync \ strace \ + libc-mtrace \ "
Nitin:
A better way to do this is all in the task bb file using an override MTRACE = ""
MTRACE_libc-eglibc = "eglibc-mtrace"
Sau!
Quoted 13 lines
meta/recipes-core/uclibc/uclibc.inc +1
-1@@ -89,7 +89,7 @@ RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # going to work. So we pretend that we have it to make bitbake not pull other recipes # to satisfy this dependency for the images/tasks -RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH)" +RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH) libc-mtrace" SRC_URI = "\ http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \
Re: [PATCH 1/1] eglibc: package mtrace separately
Quoted 129 lines
-----Original Message-----
From: Saul Wold [mailto:[email protected]]
Sent: Friday, May 18, 2012 12:43 AM
To: Patches and discussions about the oe-core layer
Cc: Kamble, Nitin A
Subject: Re: [OE-core] [PATCH 1/1] eglibc: package mtrace separatelyQuoted 5 lines · On 05/18/2012 02:07 AM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
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.
Quoted 21 lines
make uclibc recipe lie about providing libc-mtrace to satisfy the dependency
This fixes bug: [YOCTO# 2374]
Signed-off-by Nitin A Kamble<[email protected]>--- meta/recipes-core/eglibc/eglibc-package.inc | 7 ++++++- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- meta/recipes-core/tasks/task-core-tools-debug.bb | 1 + meta/recipes-core/uclibc/uclibc.inc | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-)meta/recipes-core/eglibc/eglibc-package.inc +0
-0meta/recipes-core/eglibc/eglibc-package.inc USE_LDCONFIG ?= "1" · line 23
Quoted 4 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-1@@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -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}"
meta/recipes-core/eglibc/eglibc-package.inc USE_LDCONFIG ?= "1" · line 23
Quoted 1 line
meta/recipes-core/eglibc/eglibc-package.inc +1
-0+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}"
meta/recipes-core/eglibc/eglibc-package.inc FILES_${PN}-dev_append += "${bindir}/rpcgen
Quoted 9 lines
meta/recipes-core/eglibc/eglibc-package.inc +1
-0# The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" +RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev"@@ -48,11 +49,13 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen${libdir}/*_nonshared.a \
meta/recipes-core/eglibc/eglibc-package.inc FILES_${PN}-dev_append += "${bindir}/rpcgen · line 49
Quoted 1 line
meta/recipes-core/eglibc/eglibc-package.inc +0
-0${base_libdir}/*_nonshared.a ${base_libdir}/*.o${datadir}/aclocal"
meta/recipes-core/eglibc/eglibc-package.inc FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \
Quoted 11 lines
meta/recipes-core/eglibc/eglibc-package.inc +2
-0FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_${PN}-utils += "bash" +RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} ="${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
meta/recipes-core/eglibc/eglibc-package.inc SUMMARY_ldd = "print shared library dependencies" · line 71
Quoted 3 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-0RPROVIDES_${PN}-dev += "libc-dev"@@ -68,6 +71,8 @@ SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependenciesfor each program or shared library specified on the command line."
meta/recipes-core/eglibc/eglibc-package.inc SUMMARY_ldd = "print shared library dependencies" · line 73
Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-0SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_${PN}-utils = "Miscellaneous utilities includinggetconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..."
meta/recipes-core/eglibc/eglibc-package.inc SUMMARY_ldd = "print shared library dependencies"
Quoted 3 lines
meta/recipes-core/eglibc/eglibc-package.inc +2
-0+SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" +DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" DESCRIPTION_libsotruss = "Library to support sotruss which tracescalls through PLTs"
Quoted 36 lines
meta/recipes-core/eglibc/eglibc-package.inc +0
-0inherit libc-common multilib_headermeta/recipes-core/eglibc/eglibc_2.13.bb +1
-1@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "15508" DEPENDS += "gperf-native" -PR = "r26" +PR = "r27" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"meta/recipes-core/eglibc/eglibc_2.15.bb +1
-1@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "17386" DEPENDS += "gperf-native" -PR = "r10" +PR = "r11" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_15"meta/recipes-core/tasks/task-core-tools-debug.bb +0
-0meta/recipes-core/tasks/task-core-tools-debug.bb RDEPENDS_${PN} = "\ · line 27
Quoted 5 lines
meta/recipes-core/tasks/task-core-tools-debug.bb +1
-0@@ -23,4 +23,5 @@ RDEPENDS_${PN} = "\ tcf-agent \ rsync \ strace \ + libc-mtrace \ "Nitin:
Quoted 6 lines
A better way to do this is all in the task bb file using an override MTRACE = ""
MTRACE_libc-eglibc = "eglibc-mtrace"Sau!
Saul,
I don't understand, why is it better?
Nitin
Quoted 19 lines
meta/recipes-core/uclibc/uclibc.inc RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" · line 89
Quoted 8 lines
meta/recipes-core/uclibc/uclibc.inc +0
-0@@ -89,7 +89,7 @@ RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # going to work. So we pretend that we have it to make bitbake notpull other recipes
Quoted 8 lines
meta/recipes-core/uclibc/uclibc.inc +1
-1# to satisfy this dependency for the images/tasks -RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH)" +RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH) libc-mtrace" SRC_URI = "\http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-
${PV}
Quoted 1 line
\
Re: [PATCH 1/1] eglibc: package mtrace separately
In reply to Saul WoldQuoted 4 lines · Saul Wold
A better way to do this is all in the task bb file using an override MTRACE = ""
MTRACE_libc-eglibc = "eglibc-mtrace"
this would be needed if other libc (uclibc) was not providing it but Nitin's patch already changed uclibc to provide dummy mtrace but thinking of it using the above might be a better thing to do instead of adding a dummy provide in uclibc