On Tue, Feb 03, 2015 at 12:10:02PM +0000, Paul Eggleton wrote: > Hi Bian, > > On Tuesday 03 February 2015 13:20:16 Bian Naimeng wrote: > > Signed-off-by: Bian Naimeng <[email protected]> > > Could you please re-send this with -M as it's very difficult to see what you > have changed with the default formatting.
And rebase before re-send, because this version doesn't apply in current master: OE @ ~/meta-openembedded $ pwam 87897 2015-02-04 17:08:48 URL:http://patchwork.openembedded.org/patch/87897/mbox/ [22043] -> "pw-am-87897.patch" [1] Applying: php: update to 5.5.21 to fix some bugs. error: patch failed: meta-oe/recipes-devtools/php/php_5.5.20.bb:1 error: meta-oe/recipes-devtools/php/php_5.5.20.bb: patch does not apply /OE/meta-openembedded/.git/rebase-apply/patch:491: new blank line at EOF. + Patch failed at 0001 php: update to 5.5.21 to fix some bugs. The copy of the patch that failed is found in: /OE/meta-openembedded/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". > > Thanks, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
