Patchwork gdb: upgrade from 7.3 to 7.3a

login
register
mail settings
Submitter Sebastian Krzyszkowiak
Date Aug. 29, 2011, 1:13 p.m.
Message ID <1314623612-17596-1-git-send-email-dos@dosowisko.net>
Download mbox | patch
Permalink /patch/10725/
State New, archived
Headers show

Comments

Sebastian Krzyszkowiak - Aug. 29, 2011, 1:13 p.m.
* because 7.3 archive is not fetchable anymore

Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
---
 meta/recipes-devtools/gdb/gdb-common.inc           |    6 +++---
 .../recipes-devtools/gdb/gdb-cross-canadian_7.3.bb |    7 -------
 .../gdb/gdb-cross-canadian_7.3a.bb                 |    7 +++++++
 meta/recipes-devtools/gdb/gdb-cross_7.3.bb         |    6 ------
 meta/recipes-devtools/gdb/gdb-cross_7.3a.bb        |    6 ++++++
 meta/recipes-devtools/gdb/gdb_7.3.bb               |    8 --------
 meta/recipes-devtools/gdb/gdb_7.3a.bb              |    8 ++++++++
 7 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
 create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
 delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.3.bb
 create mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.3a.bb
 delete mode 100644 meta/recipes-devtools/gdb/gdb_7.3.bb
 create mode 100644 meta/recipes-devtools/gdb/gdb_7.3a.bb
Richard Purdie - Aug. 30, 2011, 9:13 p.m.
On Mon, 2011-08-29 at 15:13 +0200, Sebastian Krzyszkowiak wrote:
> * because 7.3 archive is not fetchable anymore
> 
> Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>

Merged to master, thanks.

Richard
Michael Morscher - Aug. 30, 2011, 10:12 p.m.
Hey,

Thanks for the recent patch, but the patches need another handwork:

| NOTE: Applying patch 'no-werror.patch' 
(../meta/recipes-devtools/gdb/gdb/no-werror.patch)
| ERROR: Error executing a python function in 
/build/oe-core/meta/recipes-devtools/gdb/gdb_7.3a.bb:
| CmdError: Command Error: exit status: 1  Output:
| Applying patch no-werror.patch
| patching file bfd/warning.m4
| Hunk #1 FAILED at 23.
| 1 out of 1 hunk FAILED -- rejects in file bfd/warning.m4
| patching file configure.ac
| Hunk #1 FAILED at 3371.
| 1 out of 1 hunk FAILED -- rejects in file configure.ac
| patching file gdb/Makefile.in
| Hunk #1 FAILED at 151.
| 1 out of 1 hunk FAILED -- rejects in file gdb/Makefile.in
| patching file gdb/configure.ac
| Hunk #1 FAILED at 1525.
| Hunk #2 FAILED at 1587.
| 2 out of 2 hunks FAILED -- rejects in file gdb/configure.ac
| Patch no-werror.patch does not apply (enforce with -f)
|
| ERROR: The stack trace of python calls that resulted in this 
exception/failure was:
| ERROR:   File "patch_do_patch", line 136, in <module>
| ERROR:
| ERROR:   File "patch_do_patch", line 133, in patch_do_patch
| ERROR:
| ERROR:   File "/build/oe-core/meta/lib/oe/patch.py", line 338, in Resolve
| ERROR:     raise sys.exc_value
| ERROR:
| ERROR: The code that was being executed was:
| ERROR:      0132:                     raise 
bb.build.FuncFailed(str(sys.exc_value))
| ERROR:      0133:             resolver.Resolve()
| ERROR:      0134:
| ERROR:      0135:
| ERROR:  *** 0136:patch_do_patch(d)
| ERROR:      0137:
| ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
| ERROR:      0129:                     patchset.Import({"file":local, 
"remote":url, "strippath": striplevel}, True)
| ERROR:      0130:             except Exception:
| ERROR:      0131:                     import sys
| ERROR:      0132:                     raise 
bb.build.FuncFailed(str(sys.exc_value))
| ERROR:  *** 0133:             resolver.Resolve()
| ERROR:      0134:
| ERROR:      0135:
| ERROR:      0136:patch_do_patch(d)
| ERROR:      0137:
| ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
| ERROR: Function 'patch_do_patch' failed

Bye
Michael
Sebastian Krzyszkowiak - Aug. 30, 2011, 10:18 p.m.
On 8/31/11, Michael Morscher <michael.morscher@hs-augsburg.de> wrote:
> Hey,
>
> Thanks for the recent patch, but the patches need another handwork:

Whoops... I wasn't able to test it, as one of gdb's dependency was
failing to me due to bug in gcc. Anyway, I'll try to fix it later,
thanks for info.
Richard Purdie - Aug. 30, 2011, 11:43 p.m.
On Wed, 2011-08-31 at 00:18 +0200, Sebastian Krzyszkowiak wrote:
> On 8/31/11, Michael Morscher <michael.morscher@hs-augsburg.de> wrote:
> > Hey,
> >
> > Thanks for the recent patch, but the patches need another handwork:
> 
> Whoops... I wasn't able to test it

You're posting patches with no testing?!

I'd warn people that if this happens I'll be regarding any future
patches with suitable caution. If you're going to post something with no
testing, at least please say so...

Cheers,

Richard
Sebastian Krzyszkowiak - Aug. 31, 2011, 9:40 a.m.
On 8/31/11, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-08-31 at 00:18 +0200, Sebastian Krzyszkowiak wrote:
>> On 8/31/11, Michael Morscher <michael.morscher@hs-augsburg.de> wrote:
>> > Hey,
>> >
>> > Thanks for the recent patch, but the patches need another handwork:
>>
>> Whoops... I wasn't able to test it
>
> You're posting patches with no testing?!
>
> I'd warn people that if this happens I'll be regarding any future
> patches with suitable caution. If you're going to post something with no
> testing, at least please say so...

I've tested fetching (as that's what that patch was fixing - old
version was unfetchable at all). Well, when I think about it now, I
could test do_patch without dependencies as well, but unfortunately
that didn't came to my mind before :(
Michael Morscher - Aug. 31, 2011, 1:16 p.m.
Hey Richard,

Thanks for your patch for gdb, but gdb-cross-canadian is also broken:

Log data follows:
| NOTE: Applying patch 'no-werror.patch' 
(../meta/recipes-devtools/gdb/gdb/no-werror.patch)
| ERROR: Error executing a python function in 
/build/oe-core/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb:
| CmdError: Command Error: exit status: 1  Output:
| Applying patch no-werror.patch
| patching file bfd/warning.m4
| Hunk #1 FAILED at 23.
| 1 out of 1 hunk FAILED -- rejects in file bfd/warning.m4
| patching file configure.ac
| Hunk #1 FAILED at 3371.
| 1 out of 1 hunk FAILED -- rejects in file configure.ac
| patching file gdb/Makefile.in
| Hunk #1 FAILED at 151.
| 1 out of 1 hunk FAILED -- rejects in file gdb/Makefile.in
| patching file gdb/configure.ac
| Hunk #1 FAILED at 1525.
| Hunk #2 FAILED at 1587.
| 2 out of 2 hunks FAILED -- rejects in file gdb/configure.ac
| Patch no-werror.patch does not apply (enforce with -f)
|
| ERROR: The stack trace of python calls that resulted in this 
exception/failure was:
| ERROR:   File "patch_do_patch", line 136, in <module>
| ERROR:
| ERROR:   File "patch_do_patch", line 133, in patch_do_patch
| ERROR:
| ERROR:   File "/build/oe-core/meta/lib/oe/patch.py", line 338, in Resolve
| ERROR:     raise sys.exc_value
| ERROR:
| ERROR: The code that was being executed was:
| ERROR:      0132:                     raise 
bb.build.FuncFailed(str(sys.exc_value))
| ERROR:      0133:             resolver.Resolve()
| ERROR:      0134:
| ERROR:      0135:
| ERROR:  *** 0136:patch_do_patch(d)
| ERROR:      0137:
| ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
| ERROR:      0129:                     patchset.Import({"file":local, 
"remote":url, "strippath": striplevel}, True)
| ERROR:      0130:             except Exception:
| ERROR:      0131:                     import sys
| ERROR:      0132:                     raise 
bb.build.FuncFailed(str(sys.exc_value))
| ERROR:  *** 0133:             resolver.Resolve()
| ERROR:      0134:
| ERROR:      0135:
| ERROR:      0136:patch_do_patch(d)
| ERROR:      0137:
| ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
| ERROR: Function 'patch_do_patch' failed
NOTE: package gdb-cross-canadian-arm-7.3a-r4.0: task do_patch: Failed


Bye
Richard Purdie - Aug. 31, 2011, 6:46 p.m.
On Wed, 2011-08-31 at 15:16 +0200, Michael Morscher wrote:
> Thanks for your patch for gdb, but gdb-cross-canadian is also broken:

Sorry about that, I've pushed a fix for it and the problem with
gdb-cross too...

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 9879e97..074f913 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -11,7 +11,7 @@  LTTNGUST_mipsel = ""
 LTTNGUST_mips64 = ""
 LTTNGUST_mips64el = ""
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -22,8 +22,8 @@  inherit autotools
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
            file://no-werror.patch"
 
-SRC_URI[md5sum] = "1d6b4e469270433583ef62a906c02fa8"
-SRC_URI[sha256sum] = "d1791d1f9d6c21ec265f4f74dadc15bc35698158a1b836d1626b9a69b818f5c5"
+SRC_URI[md5sum] = "9443a370dabd9ca9c41b496b59f05145"
+SRC_URI[sha256sum] = "2c2b26eea33ab477ea1f7739a8e511b1e8d89b6f74d87cdd510c6262a3af82d7"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CXX_FOR_BUILD = "${BUILD_CXX}"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
deleted file mode 100644
index 58c20c4..0000000
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-require gdb-common.inc
-require gdb-cross-canadian.inc
-
-PR = "${INC_PR}.0"
-
-GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
-EXPAT = "--with-expat"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
new file mode 100644
index 0000000..58c20c4
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
@@ -0,0 +1,7 @@ 
+require gdb-common.inc
+require gdb-cross-canadian.inc
+
+PR = "${INC_PR}.0"
+
+GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
+EXPAT = "--with-expat"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.3.bb b/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
deleted file mode 100644
index 587d518..0000000
--- a/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@ 
-require gdb-cross.inc
-
-SRC_URI += "file://sim-install-6.6.patch"
-EXPAT = "--with-expat"
-
-PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.3a.bb b/meta/recipes-devtools/gdb/gdb-cross_7.3a.bb
new file mode 100644
index 0000000..587d518
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.3a.bb
@@ -0,0 +1,6 @@ 
+require gdb-cross.inc
+
+SRC_URI += "file://sim-install-6.6.patch"
+EXPAT = "--with-expat"
+
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/gdb/gdb_7.3.bb b/meta/recipes-devtools/gdb/gdb_7.3.bb
deleted file mode 100644
index 5e21858..0000000
--- a/meta/recipes-devtools/gdb/gdb_7.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@ 
-require gdb.inc
-LICENSE="GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
-		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
-PR = "${INC_PR}.0"
-
diff --git a/meta/recipes-devtools/gdb/gdb_7.3a.bb b/meta/recipes-devtools/gdb/gdb_7.3a.bb
new file mode 100644
index 0000000..5e21858
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb_7.3a.bb
@@ -0,0 +1,8 @@ 
+require gdb.inc
+LICENSE="GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
+PR = "${INC_PR}.0"
+