[oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes

[Martin Jansa]

On Sat, Jun 29, 2013 at 05:36:36PM +0200, Martin Jansa wrote:
> On Sat, Jun 29, 2013 at 07:30:59AM -0700, Khem Raj wrote:
> > 
> > On Jun 29, 2013, at 5:27 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> > 
> > > Fails to apply cleanly:
> > > 
> > > patching file recipes-browser/chromium/chromium/google-chrome.desktop
> > > Reversed (or previously applied) patch detected!  Assume -R? [n] ^C
> > > 
> > > 
> > 
> > don't know what going on there in your tree, but I observed that one of the patch is already applied
> > so I rebased the patch set on top of master and resent a V3. retry and let me know if it works
> > this time. If not I will push it to a contrib tree and you can cherry pick
> 
> I've double checked that my tree was identical to origin/master before
> writting this, then I've applied it manually and already pushed it before
> I've replied here, so I wonder if there is another repo which wasn't synced?
> 
> Because your rebase should show that everything is already there.
> 
> I've pushed it to:
> origin  git at github.com:OSSystems/meta-browser.git (push)

Few more details:

Can you compare downloaded patch from patchwork with your local version to see if it got broken by patchwork?

I've tried to apply v3 again in older revision and it fails the same.

OE @ ~/meta-browser $ git checkout -b dc77daa292ef10b38fdcd143d6bfae5008a81a5a dc77daa292ef10b38fdcd143d6bfae5008a81a5a
Switched to a new branch 'dc77daa292ef10b38fdcd143d6bfae5008a81a5a'

OE @ ~/meta-browser $ pw-am.sh.oe-core 52693
2013-06-29 17:40:39 URL:http://patchwork.openembedded.org/patch/52693/mbox/ [68535] -> "pw-am-52693.patch" [1]
Applying: chromium: Remove older recipes
/OE/meta-browser/.git/rebase-apply/patch:347: trailing whitespace.
if [ "${USER}" = "root" ] ; then 
error: patch failed: recipes-browser/chromium/chromium/google-chrome.desktop:1
error: recipes-browser/chromium/chromium/google-chrome.desktop: patch does not apply
Patch failed at 0001 chromium: Remove older recipes
The copy of the patch that failed is found in:
   /OE/meta-browser/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

The same when tried from revision 1f633bb291fd71f0265a1402e6d6e53d95e00bd1
which is before that nspr commit you mentioned.

-- 
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/20130629/cba7cd02/attachment-0002.sig>