From b9ddc4944219519edd69096200ab64734ef32f0b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 6 Dec 2016 20:02:53 -0700 Subject: [PATCH 1/3] gdbserver-external: drop bits that belong with gdb, not gdbserver This fixes a gdb/gdbserver-external file conflict. Signed-off-by: Christopher Larson --- recipes-external/gdb/gdbserver-external.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipes-external/gdb/gdbserver-external.bb b/recipes-external/gdb/gdbserver-external.bb index a0aace5..8b191f5 100644 --- a/recipes-external/gdb/gdbserver-external.bb +++ b/recipes-external/gdb/gdbserver-external.bb @@ -18,15 +18,7 @@ def get_gdb_license(d): LICENSE := "${@get_gdb_license(d)}" LICENSE[vardepvalue] = "${LICENSE}" -FILES_${PN} = "\ - ${bindir}/gdbserver \ - ${datadir}/gdb/guile \ - ${datadir}/gdb/python/gdb \ - ${datadir}/gdb/syscalls \ - ${datadir}/gdb/system-gdbinit \ - ${libdir}/libinproctrace.so \ -" -INSANE_SKIP_${PN} += "dev-so" +FILES_${PN} = "${bindir}/gdbserver" FILES_${PN}-doc = "${mandir}/man1/gdbserver.1" # Ensure that our rdeps are able to be set by shlibs processing From a098af1ea555fe4290fa9bd10f7b33a0acc0c0cf Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 6 Dec 2016 20:03:20 -0700 Subject: [PATCH 2/3] gdbserver-external: update SUMMARY for gdbserver, not gdb Signed-off-by: Christopher Larson --- recipes-external/gdb/gdbserver-external.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-external/gdb/gdbserver-external.bb b/recipes-external/gdb/gdbserver-external.bb index 8b191f5..1f7702a 100644 --- a/recipes-external/gdb/gdbserver-external.bb +++ b/recipes-external/gdb/gdbserver-external.bb @@ -1,4 +1,4 @@ -SUMMARY = "gdb - GNU debugger" +SUMMARY = "gdbserver is a program that allows you to run GDB on a different machine than the one which is running the program being debugged" HOMEPAGE = "http://www.gnu.org/software/gdb/" SECTION = "devel" PV := "${@oe.external.run(d, 'gdb', '-v').splitlines()[0].split()[-1]}" From 87616f2b2039d21aa178c89f8b7cdd71525f60ba Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 6 Dec 2016 20:03:31 -0700 Subject: [PATCH 3/3] tcmode: change gdbserver default to gdbserver-external Using the one already available with our toolchain makes a great deal of sense, as it's a known quantity. The only reason we switched to gdb was due to conflicts between gdb and gdbserver-external, but that issue has been resolved. Signed-off-by: Christopher Larson --- 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 4738e36..0ee6996 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -45,7 +45,7 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc-external" PREFERRED_PROVIDER_virtual/libintl ?= "glibc-external" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-external" -PREFERRED_PROVIDER_gdbserver ??= "gdb" +PREFERRED_PROVIDER_gdbserver ??= "gdbserver-external" PREFERRED_PROVIDER_oprofile ??= "oprofile" # These are defined in default-providers.inc, which is parsed before the