| Submitter | Phil Blundell |
|---|---|
| Date | July 13, 2011, 4:47 p.m. |
| Message ID | <1310575653.2378.33.camel@phil-desktop> |
| Download | mbox | patch |
| Permalink | /patch/7543/ |
| State | New, archived |
| Headers | show |
Comments
On Wed, 2011-07-13 at 17:47 +0100, Phil Blundell wrote: > Similarly to libnss*, if ${libdir} and ${base_libdir} were the same path then > libthread_db would land in ${PN}-dev rather than the intended place. As before, > fix this by moving eglibc-thread-db earlier in PACKAGES and adjusting its FILES > to not capture the .so symlink. > > Bump PR for both 2.12 and 2.13. > > Signed-off-by: Phil Blundell <philb@gnu.org> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 4 ++-- > meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- > meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 344f5e4..faf68f7 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -20,7 +20,7 @@ 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 ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" # Create a eglibc-binaries ALLOW_EMPTY_${PN}-binaries = "1" @@ -71,7 +71,7 @@ FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_eglibc-utils += "bash" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" +FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_eglibc-dev += "libc-dev" SUMMARY_sln = "The static ln." diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index fd7b485..1ada892 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r19" +PR = "r20" SRCREV = "14158" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index feaf7ca..6076ab9 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r7" +PR = "r8" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
Similarly to libnss*, if ${libdir} and ${base_libdir} were the same path then libthread_db would land in ${PN}-dev rather than the intended place. As before, fix this by moving eglibc-thread-db earlier in PACKAGES and adjusting its FILES to not capture the .so symlink. Bump PR for both 2.12 and 2.13. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/recipes-core/eglibc/eglibc-package.inc | 4 ++-- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)