aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-17 04:02:08 -0500
committerChen Qi <Qi.Chen@windriver.com>2014-12-19 17:05:26 +0800
commiteea9ee5b88e18fd5e1aa64f5f40df2cd0be9d910 (patch)
tree20a6ba58dae0e87ef966fb9468ea8ad29f933bee
parenta17981b1a7724354814a5f9d08507df94330f4a8 (diff)
downloadopenembedded-core-contrib-ChenQi/hardcoding.tar.gz
openembedded-core-contrib-ChenQi/hardcoding.tar.bz2
openembedded-core-contrib-ChenQi/hardcoding.zip
glibc-package.inc: fix order in PACKAGESChenQi/hardcoding
FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" From the above two assignments, we can see that ${PN}-utils needs to be ordered after ${PN} in the PACKAGES variable. Otherwise, ldconfig would be packaged into ${PN}-utils if ${base_sbindir} and ${sbindir} point to the same location. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 6212e5b38e..2a7a292188 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-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 tzcode ${PN}-utils glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
# The ld.so in this glibc supports the GNU_HASH
RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"