aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-11 19:14:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 14:44:54 +0100
commitec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e (patch)
treea3463953aa6ceff9c1d3a77d92feae11818f938e /meta/recipes-core/eglibc
parent019a95a5e01bd3fefaaab0a27029ed8b26ee3c79 (diff)
downloadopenembedded-core-contrib-ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e.tar.gz
openembedded-core-contrib-ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e.tar.bz2
openembedded-core-contrib-ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e.zip
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. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
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 edf7a759e67..ab7540afb45 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 030b2351bdf..78dc44a6759 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"