From ae9a80678a1a19d73f976496f22239e651aae74f Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 11 Sep 2012 19:14:25 +0100 Subject: [PATCH] eglibc: Restore ${PN} to before ${PN}-dev in PACKAGES Commit 13544fbc6217fee1731a6da1e2cf94901a500842 changed the ordering of PACKAGES so that ${PN}-dev came before ${PN}. However, this caused the FILES matching to go wrong if ${libdir} == ${base_libdir}. Fix this by moving ${PN} ahead of ${PN}-dev once again. (From OE-Core rev: ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e) Signed-off-by: Phil Blundell Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index edf7a75..ab7540a 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -17,7 +17,7 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc rtld(GNU_HASH)" diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index 030b235..78dc44a 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "20393" DEPENDS += "gperf-native kconfig-frontends-native" -PR = "r8" +PR = "r9" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_16" -- 2.7.4