From 6d62e6fc289f3e86529bcdf62e83294e07356983 Mon Sep 17 00:00:00 2001 From: Mikhail Durnev Date: Thu, 3 Apr 2014 00:59:50 -0500 Subject: [PATCH] external-sourcery-toolchain: Fixed packaging Fixed packaging for PACKAGE_DEBUG_SPLIT_STYLE="debug-file-directory" Signed-off-by: Mikhail Durnev --- recipes/meta/external-sourcery-toolchain.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index afb6d73..16d5a2b 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -89,6 +89,17 @@ do_install() { ${@base_conditional('PREFERRED_PROVIDER_lttng-ust', PN, '', 'rm -rf ${D}${libdir}/liblttng-ust*.* ${D}${libdir}/libmet* ${D}${libdir}/mettools ${D}${includedir}/lttng/bug.h ${D}${includedir}/lttng/align.h ${D}${includedir}/lttng/ust*.h ${D}${includedir}/lttng/tracepoint*.h ${D}${includedir}/lttng/ringbuffer*.h', d)} ${@base_conditional('PREFERRED_PROVIDER_lttng-tools', PN, '', 'rm -rf ${D}${bindir}/lttng* ${D}${libdir}/liblttng-ctl.so.* ${D}${libdir}/lttng ${D}${libdir}/liblttng-ctl.so ${D}${libdir}/liblttng-ctl.a ${D}${includedir}/lttng/lttng.h', d)} chown -R 0:0 ${D} + + if [ "${PACKAGE_DEBUG_SPLIT_STYLE}" == "debug-file-directory" ]; then + + install -d ${D}${libdir}/debug + + for dir in ${base_libdir} ${base_sbindir} ${libdir} ${bindir} ${sbindir} ${libdir}/audit ${libexecdir}/getconf; do + install -d ${D}${libdir}/debug$dir + mv ${D}$dir/.debug/*.debug ${D}${libdir}/debug$dir || true + rm -rf ${D}$dir/.debug + done + fi } # These files are picked up out of the sysroot by eglibc-locale, so we don't @@ -244,6 +255,7 @@ FILES_libstdc++-dev = "${includedir}/c++/${PV} \ FILES_libstdc++-staticdev = "${libdir}/libstdc++.a ${libdir}/libsupc++.a" FILES_gdbserver = "${bindir}/gdbserver ${libdir}/bin/sysroot-gdbserver" FILES_gdbserver-dbg = "${bindir}/.debug/gdbserver.debug" +FILES_gdbserver-dbg += "${libdir}/debug${bindir}/gdbserver.debug" CSL_VER_MAIN ??= ""