[oe] gcc-4.6 patches in meta-oe need to be rebased on new oe-core revision

[Martin Jansa]

Hi,

oe-core recipe was upgraded yesterday:
http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4

and
ie Patch gcc-4.6-linaro-r106741.patch does not apply anymore

ERROR: Error executing a python function in /OE/shr-core/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb:
CmdError: Command Error: exit status: 1  Output:
Applying patch gcc-4.6-linaro-r106741.patch
patching file gcc/combine.c
Hunk #2 succeeded at 3112 (offset 26 lines).
Hunk #3 succeeded at 3129 (offset 26 lines).
Hunk #4 succeeded at 3168 (offset 26 lines).
Hunk #5 succeeded at 3198 (offset 26 lines).
Hunk #6 succeeded at 3260 (offset 26 lines).
Hunk #7 succeeded at 3268 (offset 26 lines).
Hunk #8 succeeded at 4943 (offset 29 lines).
Hunk #9 succeeded at 5010 (offset 29 lines).
Hunk #10 succeeded at 5027 (offset 29 lines).
Hunk #11 succeeded at 5073 (offset 29 lines).
Hunk #12 succeeded at 5151 (offset 29 lines).
Hunk #13 succeeded at 5210 (offset 29 lines).
Hunk #14 succeeded at 5230 (offset 29 lines).
Hunk #15 succeeded at 5290 (offset 29 lines).
Hunk #16 FAILED at 5606.
| NOTE: Applying patch 'gcc-4.6-linaro-r106720.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106720.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106723.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106723.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106729.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106729.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106733.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106733.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106737.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106737.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106738.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106738.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106739.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106739.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106740.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106740.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106741.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch)
| ERROR: Error executing a python function in /OE/shr-core/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb:
| CmdError: Command Error: exit status: 1  Output:
| Applying patch gcc-4.6-linaro-r106741.patch
| patching file gcc/combine.c
| Hunk #2 succeeded at 3112 (offset 26 lines).
| Hunk #3 succeeded at 3129 (offset 26 lines).
| Hunk #4 succeeded at 3168 (offset 26 lines).
| Hunk #5 succeeded at 3198 (offset 26 lines).
| Hunk #6 succeeded at 3260 (offset 26 lines).
| Hunk #7 succeeded at 3268 (offset 26 lines).
| Hunk #8 succeeded at 4943 (offset 29 lines).
| Hunk #9 succeeded at 5010 (offset 29 lines).
| Hunk #10 succeeded at 5027 (offset 29 lines).
| Hunk #11 succeeded at 5073 (offset 29 lines).
| Hunk #12 succeeded at 5151 (offset 29 lines).
| Hunk #13 succeeded at 5210 (offset 29 lines).
| Hunk #14 succeeded at 5230 (offset 29 lines).
| Hunk #15 succeeded at 5290 (offset 29 lines).
| Hunk #16 FAILED at 5606.
| Hunk #17 succeeded at 5728 (offset 29 lines).
| Hunk #18 succeeded at 5783 (offset 29 lines).
| Hunk #19 succeeded at 5984 (offset 29 lines).
| Hunk #20 succeeded at 6205 (offset 29 lines).
| 1 out of 20 hunks FAILED -- rejects in file gcc/combine.c
| Patch gcc-4.6-linaro-r106741.patch does not apply (enforce with -f)

I've pinged khem on IRC yesterday.. but posting also here just for record.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110929/ecd64edf/attachment-0002.sig>