4 files changed, 12 insertions, 4 deletions
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index d3bda85e1..16b653e46 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -24,7 +24,7 @@ EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 EXPAT = "--without-expat"
 
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
-                --with-curses --disable-multilib --with-readline --disable-sim \
+                --with-curses --disable-multilib --with-system-readline --disable-sim \
                 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
 GDBPROPREFIX = "--program-prefix=''"
 
@@ -35,6 +35,14 @@ do_configure () {
 	oe_runconf
 }
 
+# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
+# right bits installed by binutils.
+do_install_append() {
+	rm -rf ${D}${libdir}
+	rm -rf ${D}${includedir}
+	rm -rf ${D}${datadir}/locale
+}
+
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
index 5982c0568..3adcdcc28 100644
--- a/meta/packages/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
 
 inherit cross-canadian
 
-PR = "r0"
+PR = "r1"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 EXPAT = "--with-expat"
diff --git a/meta/packages/gdb/gdb-cross_7.1.bb b/meta/packages/gdb/gdb-cross_7.1.bb
index b0d0ab87c..3e4ce6f68 100644
--- a/meta/packages/gdb/gdb-cross_7.1.bb
+++ b/meta/packages/gdb/gdb-cross_7.1.bb
@@ -2,4 +2,4 @@ require gdb-cross.inc
 
 SRC_URI += "file://sim-install-6.6.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/packages/gdb/gdb_7.1.bb
index 5b8f3769b..be40f3f12 100644
--- a/meta/packages/gdb/gdb_7.1.bb
+++ b/meta/packages/gdb/gdb_7.1.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-PR = "r1"
+PR = "r2"