From eea9ee5b88e18fd5e1aa64f5f40df2cd0be9d910 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 17 Nov 2014 04:02:08 -0500 Subject: glibc-package.inc: fix order in PACKAGES 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 --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)" -- cgit 1.2.3-korg