From d04a2566f1291b8b964a22df79dfb22cc6c0a1b4 Mon Sep 17 00:00:00 2001 From: Yasir-Khan Date: Tue, 2 Sep 2014 17:31:34 +0500 Subject: [PATCH 1/2] external-sourcery-toolchain: avoid conflict with util-linux Remove bits which are also being provided by package util-linux to resolve build warnings. Signed-off-by: Yasir-Khan --- recipes/meta/external-sourcery-toolchain.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 36780e2..263cc09 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -96,6 +96,9 @@ do_install() { ${@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}${libdir}/pkgconfig ${D}${includedir}/lttng/lttng-error.h', d)} chown -R 0:0 ${D} + # Remove files that are being provided by package util-linux + rm -rf ${D}${libdir}/libmount* ${D}${libdir}/libblkid* ${D}${includedir}/libmount/libmount.h ${D}${includedir}/blkid/blkid.h ${D}${datadir}/bash-completion + if [ "${PACKAGE_DEBUG_SPLIT_STYLE}" == "debug-file-directory" ]; then install -d ${D}${libdir}/debug From d44384e9a4458261409772817b37e38ba1aa511f Mon Sep 17 00:00:00 2001 From: Yasir-Khan Date: Tue, 2 Sep 2014 17:36:02 +0500 Subject: [PATCH 2/2] external-sourcery-toolchain: skip unpackaged warnings Correctly skip the build warnings for unpackaged files. Signed-off-by: Yasir-Khan --- recipes/meta/external-sourcery-toolchain.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 263cc09..dc0e506 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -210,7 +210,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # We support multiple toolchain versions, so an unpackaged file isn't # necessarily a problem. -ERROR_QA_remove = "installed-vs-shipped" +INSANE_SKIP_${PN} = "installed-vs-shipped" # This test should be fixed to ignore .a files in .debug dirs INSANE_SKIP_${PN}-dbg = "staticdev"