Re: [oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes
On Fri, Jun 28, 2013 at 09:36:56AM -0700, Khem Raj wrote: Signed-off-by: Khem Raj raj.k...@gmail.com --- ...ser_main_loop.cc-fix-build-with-glib-2.35.patch | 42 -- .../chromium-24.0.1312.52/armv6/include.gypi |8 - .../chromium-24.0.1312.52/armv6/oe-defaults.gypi | 15 - .../chromium-24.0.1312.52/armv7a/include.gypi |9 - .../chromium-24.0.1312.52/armv7a/oe-defaults.gypi | 15 - .../glib-2.16-use-siginfo_t.patch | 35 -- .../chromium-24.0.1312.52/i586/include.gypi|5 - .../chromium-24.0.1312.52/i586/oe-defaults.gypi| 15 - .../chromium-24.0.1312.52/ui-gl-no-narrowing.patch | 20 - .../chromium/chromium-24.0.1312.52/unistd-2.patch | 27 - .../chromium-24.0.1312.52/x86-64/include.gypi |5 - .../chromium-24.0.1312.52/x86-64/oe-defaults.gypi | 15 - .../chromium/chromium-29.0.1518.2/google-chrome|7 + .../chromium-29.0.1518.2/google-chrome.desktop | 222 .../chromium/chromium/armv6/include.gypi | 26 - .../chromium/chromium/armv7a/include.gypi | 26 - recipes-browser/chromium/chromium/bison-2.6.patch | 558 recipes-browser/chromium/chromium/google-chrome|7 - .../chromium/chromium/google-chrome.desktop| 222 recipes-browser/chromium/chromium/gypi.patch | 19 - recipes-browser/chromium/chromium/memset.patch | 13 - .../chromium/chromium/softfloat-fix.patch | 22 - recipes-browser/chromium/chromium/unistd.patch | 51 -- recipes-browser/chromium/chromium_19.0.1049.3.bb | 150 -- recipes-browser/chromium/chromium_20.0.1086.0.bb | 141 - recipes-browser/chromium/chromium_24.0.1312.52.bb | 76 --- 26 files changed, 229 insertions(+), 1522 deletions(-) delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/0001-browser_main_loop.cc-fix-build-with-glib-2.35.patch delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/armv6/include.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/armv6/oe-defaults.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/armv7a/include.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/armv7a/oe-defaults.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/glib-2.16-use-siginfo_t.patch delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/i586/include.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/i586/oe-defaults.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/ui-gl-no-narrowing.patch delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/unistd-2.patch delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/x86-64/include.gypi delete mode 100644 recipes-browser/chromium/chromium-24.0.1312.52/x86-64/oe-defaults.gypi create mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/google-chrome create mode 100644 recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop Fails to apply cleanly: patching file recipes-browser/chromium/chromium/google-chrome.desktop Reversed (or previously applied) patch detected! Assume -R? [n] ^C delete mode 100644 recipes-browser/chromium/chromium/armv6/include.gypi delete mode 100644 recipes-browser/chromium/chromium/armv7a/include.gypi delete mode 100644 recipes-browser/chromium/chromium/bison-2.6.patch delete mode 100755 recipes-browser/chromium/chromium/google-chrome delete mode 100644 recipes-browser/chromium/chromium/google-chrome.desktop delete mode 100644 recipes-browser/chromium/chromium/gypi.patch delete mode 100644 recipes-browser/chromium/chromium/memset.patch delete mode 100644 recipes-browser/chromium/chromium/softfloat-fix.patch delete mode 100644 recipes-browser/chromium/chromium/unistd.patch delete mode 100644 recipes-browser/chromium/chromium_19.0.1049.3.bb delete mode 100644 recipes-browser/chromium/chromium_20.0.1086.0.bb delete mode 100644 recipes-browser/chromium/chromium_24.0.1312.52.bb signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes
On Jun 29, 2013, at 5:27 AM, Martin Jansa martin.ja...@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 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes
On Sat, Jun 29, 2013 at 07:30:59AM -0700, Khem Raj wrote: On Jun 29, 2013, at 5:27 AM, Martin Jansa martin.ja...@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 g...@github.com:OSSystems/meta-browser.git (push) Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes
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.ja...@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 g...@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.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-browser][PATCH V2 1/3] chromium: Remove older recipes
On Jun 29, 2013, at 8:46 AM, Martin Jansa martin.ja...@gmail.com wrote:
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.ja...@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 g...@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.
hmmm https://github.com/OSSystems/meta-browser/commits/master
shows these patches are already applied
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
