From e836579be2cfc4735cdd32da24777fe9e7e4af2d Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Mon, 23 Nov 2015 09:48:03 -0500 Subject: [PATCH 1/2] gdb: Conditionally provide gdbserver Avoid providing "gdbserver" if PREFERRED_PROVIDER is set to external-sourcery or some other package which also provides it. This avoids "Multiple Provider" warnings. Signed-off-by: Drew Moseley --- core/recipes-devtools/gdb/gdb_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/recipes-devtools/gdb/gdb_%.bbappend b/core/recipes-devtools/gdb/gdb_%.bbappend index 504b2a5..65d4cdf 100644 --- a/core/recipes-devtools/gdb/gdb_%.bbappend +++ b/core/recipes-devtools/gdb/gdb_%.bbappend @@ -1,4 +1,4 @@ -PROVIDES += "gdbserver" +PROVIDES += "${@'gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' == '${PN}' else ''}" # Disable build of gdbserver if is provided by external-sourcery-toolchain PACKAGES := "${@oe_filter_out('gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else '$', '${PACKAGES}', d)}" From 5dd5e8f4f9308027f5ee8ac15c43ba7cf3748947 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Fri, 25 Dec 2015 15:15:11 -0500 Subject: [PATCH 2/2] external-sourcery: Set PREFERRED_PROVIDER of gdbserver to gdb This forces the default setup to require gdbserver from the gdb package rather than pulling it from the external-sourcery packages. This allows the inclusion of target-tools (and specifically gdb) in the build image without resulting in multiple providers of gdbserver. Signed-off-by: Drew Moseley --- conf/distro/include/tcmode-external-sourcery.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index ac18afa..125d314 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -39,7 +39,7 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc-external" PREFERRED_PROVIDER_virtual/libintl ?= "glibc-external" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-external" -PREFERRED_PROVIDER_gdbserver ??= "gdbserver-external" +PREFERRED_PROVIDER_gdbserver ??= "gdb" PREFERRED_PROVIDER_oprofile ??= "oprofile" # These are defined in default-providers.inc, which is parsed before the