<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 8, 2013 at 5:29 PM, Saul Wold <span dir="ltr"><<a href="mailto:sgw@linux.intel.com" target="_blank">sgw@linux.intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 05/08/2013 04:59 AM, Bogdan Marinescu wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
'gdbserver-cflags-last.diff' was integrated into upstream.<br>
<br>
</blockquote></div>
Was it really? I note that the patch from Marcin still incorporates a similar patch, please verify this should not be a rebase.<br></blockquote><div><br></div><div style>I will recheck. However, does it make sense for us to work in parallel on upgrading the same package?</div>
<div style><br></div><div style>Thanks,</div><div style>Bogdan</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
Sau!<div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Bogdan Marinescu <<a href="mailto:bogdan.a.marinescu@intel.com" target="_blank">bogdan.a.marinescu@intel.com</a>><br>
---<br>
meta/recipes-devtools/gdb/gdb-<u></u>common.inc | 6 ++----<br>
...-<a href="http://canadian_7.5.1.bb" target="_blank">canadian_7.5.1.bb</a> => <a href="http://gdb-cross-canadian_7.6.bb" target="_blank">gdb-cross-canadian_7.6.bb</a>} | 2 --<br>
.../gdb/{<a href="http://gdb-cross_7.5.1.bb" target="_blank">gdb-cross_7.5.1.bb</a> => <a href="http://gdb-cross_7.6.bb" target="_blank">gdb-cross_7.6.bb</a>} | 2 --<br>
meta/recipes-devtools/gdb/gdb.<u></u>inc | 1 -<br>
.../gdb/gdb/gdbserver-cflags-<u></u>last.diff | 19 -------------------<br>
.../gdb/{<a href="http://gdb_7.5.1.bb" target="_blank">gdb_7.5.1.bb</a> => <a href="http://gdb_7.6.bb" target="_blank">gdb_7.6.bb</a>} | 1 -<br>
6 files changed, 2 insertions(+), 29 deletions(-)<br>
rename meta/recipes-devtools/gdb/{<a href="http://gdb-cross-canadian_7.5.1.bb" target="_blank">gdb<u></u>-cross-canadian_7.5.1.bb</a> => <a href="http://gdb-cross-canadian_7.6.bb" target="_blank">gdb-cross-canadian_7.6.bb</a>} (87%)<br>
rename meta/recipes-devtools/gdb/{<a href="http://gdb-cross_7.5.1.bb" target="_blank">gdb<u></u>-cross_7.5.1.bb</a> => <a href="http://gdb-cross_7.6.bb" target="_blank">gdb-cross_7.6.bb</a>} (82%)<br>
delete mode 100644 meta/recipes-devtools/gdb/gdb/<u></u>gdbserver-cflags-last.diff<br>
rename meta/recipes-devtools/gdb/{<a href="http://gdb_7.5.1.bb" target="_blank">gdb<u></u>_7.5.1.bb</a> => <a href="http://gdb_7.6.bb" target="_blank">gdb_7.6.bb</a>} (94%)<br>
<br>
diff --git a/meta/recipes-devtools/gdb/<u></u>gdb-common.inc b/meta/recipes-devtools/gdb/<u></u>gdb-common.inc<br>
index f574d5c..eca66b4 100644<br>
--- a/meta/recipes-devtools/gdb/<u></u>gdb-common.inc<br>
+++ b/meta/recipes-devtools/gdb/<u></u>gdb-common.inc<br>
@@ -12,8 +12,6 @@ LTTNGUST_mips64 = ""<br>
LTTNGUST_mips64el = ""<br>
LTTNGUST_sh4 = ""<br>
<br>
-INC_PR = "r0"<br>
-<br>
LIC_FILES_CHKSUM = "file://COPYING;md5=<u></u>59530bdf33659b29e73d4adb9f9f65<u></u>52 \<br>
file://COPYING.LIB;md5=<u></u>9f604d8a4f8e74f4f5140845a21b66<u></u>74 \<br>
file://COPYING3;md5=<u></u>d32239bcb673463ab874e80d47fae5<u></u>04 \<br>
@@ -22,8 +20,8 @@ inherit autotools<br>
<br>
SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.<u></u>tar.gz \<br>
"<br>
-SRC_URI[md5sum] = "<u></u>b1519bf899890d21d4774845a6e602<u></u>fe"<br>
-SRC_URI[sha256sum] = "<u></u>f99f26e2c1127f12ba14ece0947a9a<u></u>9948be45e96b69ef363131e469a698<u></u>636e"<br>
+SRC_URI[md5sum] = "<u></u>a9836707337e5f7bf76a009a8904f4<u></u>70"<br>
+SRC_URI[sha256sum] = "<u></u>8070389a5dcc104eb0be483d582729<u></u>f98ed4d761ad19cedd3f17b5d2502f<u></u>aa36"<br>
<br>
export CC_FOR_BUILD = "${BUILD_CC}"<br>
export CXX_FOR_BUILD = "${BUILD_CXX}"<br>
diff --git a/meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.5.1.bb" target="_blank">gd<u></u>b-cross-canadian_7.5.1.bb</a> b/meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.6.bb" target="_blank">gd<u></u>b-cross-canadian_7.6.bb</a><br>
similarity index 87%<br>
rename from meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.5.1.bb" target="_blank">gdb-<u></u>cross-canadian_7.5.1.bb</a><br>
rename to meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.6.bb" target="_blank">gdb-<u></u>cross-canadian_7.6.bb</a><br>
index c15aa7a..cbb7402 100644<br>
--- a/meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.5.1.bb" target="_blank">gd<u></u>b-cross-canadian_7.5.1.bb</a><br>
+++ b/meta/recipes-devtools/gdb/<a href="http://gdb-cross-canadian_7.6.bb" target="_blank">gd<u></u>b-cross-canadian_7.6.bb</a><br>
@@ -1,8 +1,6 @@<br>
require gdb-common.inc<br>
require gdb-cross-canadian.inc<br>
<br>
-PR = "${INC_PR}.0"<br>
-<br>
GDBPROPREFIX = "--program-prefix='${TARGET_<u></u>PREFIX}'"<br>
<br>
S = "${WORKDIR}/${BPN}-${PV}"<br>
diff --git a/meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.5.1.bb" target="_blank">gd<u></u>b-cross_7.5.1.bb</a> b/meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.6.bb" target="_blank">gd<u></u>b-cross_7.6.bb</a><br>
similarity index 82%<br>
rename from meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.5.1.bb" target="_blank">gdb-<u></u>cross_7.5.1.bb</a><br>
rename to meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.6.bb" target="_blank">gdb-<u></u>cross_7.6.bb</a><br>
index a14d0ba..8836119 100644<br>
--- a/meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.5.1.bb" target="_blank">gd<u></u>b-cross_7.5.1.bb</a><br>
+++ b/meta/recipes-devtools/gdb/<a href="http://gdb-cross_7.6.bb" target="_blank">gd<u></u>b-cross_7.6.bb</a><br>
@@ -2,6 +2,4 @@ require gdb-cross.inc<br>
<br>
SRC_URI += "file://sim-install-6.6.patch"<br>
<br>
-PR = "${INC_PR}.0"<br>
-<br>
S = "${WORKDIR}/${BPN}-${PV}"<br>
diff --git a/meta/recipes-devtools/gdb/<u></u>gdb.inc b/meta/recipes-devtools/gdb/<u></u>gdb.inc<br>
index a620eca..eb65939 100644<br>
--- a/meta/recipes-devtools/gdb/<u></u>gdb.inc<br>
+++ b/meta/recipes-devtools/gdb/<u></u>gdb.inc<br>
@@ -3,7 +3,6 @@ require gdb-common.inc<br>
inherit gettext<br>
<br>
SRC_URI += "file://kill_arm_map_symbols.<u></u>patch \<br>
- file://gdbserver-cflags-last.<u></u>diff;striplevel=0 \<br>
file://renesas-sh-native-<u></u>support.patch \<br>
"<br>
#LDFLAGS_append = " -s"<br>
diff --git a/meta/recipes-devtools/gdb/<u></u>gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/<u></u>gdb/gdbserver-cflags-last.diff<br>
deleted file mode 100644<br>
index 8256f17..0000000<br>
--- a/meta/recipes-devtools/gdb/<u></u>gdb/gdbserver-cflags-last.diff<br>
+++ /dev/null<br>
@@ -1,19 +0,0 @@<br>
-Upstream-Status: Pending<br>
-<br>
-Index: gdb/gdbserver/Makefile.in<br>
-=============================<u></u>==============================<u></u>========<br>
---- gdb/gdbserver/Makefile.in.orig 2011-03-09 23:32:02.000000000 -0800<br>
-+++ gdb/gdbserver/Makefile.in 2011-08-05 21:16:43.592202579 -0700<br>
-@@ -94,10 +94,10 @@<br>
- CFLAGS = @CFLAGS@<br>
-<br>
- # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.<br>
--INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \<br>
-+INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \<br>
- ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}<br>
- INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)<br>
--INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS)<br>
-+INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS}<br>
-<br>
- # LDFLAGS is specifically reserved for setting from the command line<br>
- # when running make.<br>
diff --git a/meta/recipes-devtools/gdb/<a href="http://gdb_7.5.1.bb" target="_blank">gd<u></u>b_7.5.1.bb</a> b/meta/recipes-devtools/gdb/<a href="http://gdb_7.6.bb" target="_blank">gd<u></u>b_7.6.bb</a><br>
similarity index 94%<br>
rename from meta/recipes-devtools/gdb/<a href="http://gdb_7.5.1.bb" target="_blank">gdb_<u></u>7.5.1.bb</a><br>
rename to meta/recipes-devtools/gdb/<a href="http://gdb_7.6.bb" target="_blank">gdb_<u></u>7.6.bb</a><br>
index 0645b56..cd323f5 100644<br>
--- a/meta/recipes-devtools/gdb/<a href="http://gdb_7.5.1.bb" target="_blank">gd<u></u>b_7.5.1.bb</a><br>
+++ b/meta/recipes-devtools/gdb/<a href="http://gdb_7.6.bb" target="_blank">gd<u></u>b_7.6.bb</a><br>
@@ -4,6 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<u></u>59530bdf33659b29e73d4adb9f9f65<u></u>52 \<br>
file://COPYING3;md5=<u></u>d32239bcb673463ab874e80d47fae5<u></u>04 \<br>
file://COPYING3.LIB;md5=<u></u>6a6a8e020838b23406c81b19c1d46d<u></u>f6 \<br>
file://COPYING.LIB;md5=<u></u>9f604d8a4f8e74f4f5140845a21b66<u></u>74"<br>
-PR = "${INC_PR}.0"<br>
<br>
S = "${WORKDIR}/${BPN}-${PV}"<br>
<br>
</blockquote>
</div></div></blockquote></div><br></div></div>