[OE-core] [OE-Core][PATCH 2/2] glibc: Rename ldd in multilib package

[Serhey Popovych]

This is symmetrical to musl change that renames ldd to ldd.${PN} for
multilib package to avoid filename collision on install.

While there add ldd to glibc package RRECOMMENDS since it is a shell
script not larger than 6Kb in size that costs nothing in compare with
overall glibc binary size and utility could be useful for trivial
debugging steps. If required recommendation can be easily dropped
(e.g. via NO_RECOMMENDATIONS).

Signed-off-by: Serhey Popovych <serhe.popovych at gmail.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index a98ae1a..3ab56bd 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -19,7 +19,8 @@ libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1"
 INSANE_SKIP_${PN}_append_aarch64 = " libdir"
 
 FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
-FILES_ldd = "${bindir}/ldd"
+RRECOMMENDS_${PN} = "ldd"
+FILES_ldd = "${bindir}/ldd${@['.${PN}', ''][not d.getVar('MLPREFIX')]}"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
 FILES_libmemusage = "${base_libdir}/libmemusage.so"
@@ -92,6 +93,10 @@ do_install_append () {
 		return
 	fi
 
+	if [ -n "${MLPREFIX}" ]; then
+		mv "${D}${bindir}/ldd" "${D}${bindir}/ldd.${PN}"
+	fi
+
 	install -d ${D}${sysconfdir}/init.d
 	install -d ${D}${localstatedir}/db/nscd
 	install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd
-- 
2.7.4