[oe-commits] Richard Purdie : gdb: 7.7.1 -> 7.8

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 1a3a3a38066834aee82c062066dcc9c3f0cdfc1f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1a3a3a38066834aee82c062066dcc9c3f0cdfc1f

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Nov  4 11:39:08 2014 +0000

gdb: 7.7.1 -> 7.8

Drop patch merged upstream.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../gdb/{gdb-7.7.1.inc => gdb-7.8.inc}             |  4 +--
 ...canadian_7.7.1.bb => gdb-cross-canadian_7.8.bb} |  0
 .../gdb/{gdb-cross_7.7.1.bb => gdb-cross_7.8.bb}   |  0
 meta/recipes-devtools/gdb/gdb.inc                  |  1 -
 .../gdb/gdb/include_asm_ptrace.patch               | 30 ----------------------
 .../gdb/{gdb_7.7.1.bb => gdb_7.8.bb}               |  0
 6 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-7.7.1.inc b/meta/recipes-devtools/gdb/gdb-7.8.inc
similarity index 70%
rename from meta/recipes-devtools/gdb/gdb-7.7.1.inc
rename to meta/recipes-devtools/gdb/gdb-7.8.inc
index aa16d5a..f4e9a9e 100644
--- a/meta/recipes-devtools/gdb/gdb-7.7.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.8.inc
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886"
-SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff"
+SRC_URI[md5sum] = "38d816d641093db2e13ba284e26090b4"
+SRC_URI[sha256sum] = "46be505fc1bc157a01124333ef37ed195147fa6a405cbfd32dea63bacaaabbe4"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.8.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.8.bb
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 7b3e59a..3321a24 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -5,7 +5,6 @@ inherit gettext
 SRC_URI += "file://kill_arm_map_symbols.patch \
             file://gdbserver-cflags-last.diff;striplevel=0 \
             file://renesas-sh-native-support.patch \
-            file://include_asm_ptrace.patch \
            "
 #LDFLAGS_append = " -s"
 #export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch
deleted file mode 100644
index 85e0147..0000000
--- a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-gdb: include asm/ptrace.h in two aarch64 source files
-
-Both sys/ptrace.h and asm/ptrace.h need to be included.
-
-Upstream-Status: Pending
-
-Signed-off-by: joe.slater at windriver.com
-
-
---- a/gdb/aarch64-linux-nat.c
-+++ b/gdb/aarch64-linux-nat.c
-@@ -32,6 +32,8 @@
- #include "elf/common.h"
- 
- #include <sys/ptrace.h>
-+#include <asm/ptrace.h>
-+
- #include <sys/utsname.h>
- 
- #include "gregset.h"
---- a/gdb/gdbserver/linux-aarch64-low.c
-+++ b/gdb/gdbserver/linux-aarch64-low.c
-@@ -26,6 +26,7 @@
- #include <signal.h>
- #include <sys/user.h>
- #include <sys/ptrace.h>
-+#include <asm/ptrace.h>
- #include <sys/uio.h>
- 
- #include "gdb_proc_service.h"
diff --git a/meta/recipes-devtools/gdb/gdb_7.7.1.bb b/meta/recipes-devtools/gdb/gdb_7.8.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_7.7.1.bb
rename to meta/recipes-devtools/gdb/gdb_7.8.bb