Re: [PATCH] [Patch V2][meta-oe]dmraid: add recipe

From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH] [Patch V2][meta-oe]dmraid: add recipe
Date: Thu, 4 Dec 2014 13:15:38 +0100	[thread overview]
Message-ID: <20141204121538.GA2453@jama> (raw)
In-Reply-To: <30DC4EDFD798C94083F3E083754532CC73DE0C7E@G08CNEXMBPEKD02.g08.fujitsu.local>

[-- Attachment #1: Type: text/plain, Size: 3160 bytes --]

On Thu, Dec 04, 2014 at 06:09:58AM +0000, Bian, Naimeng wrote:
> I'm very sorry. I have not addressed what's wrong with my e-mail client.
> Let me send the patch as attachment instead.
> And --keep-cr is necessary for git-am when applying this patch.

You can also push it to some public repo and I'll fetch it from there,
that's the safest option for weird line endings or binary blobs.

Thanks

> 
> Thanks 
>  Bian
> 
> > -----Original Message-----
> > From: openembedded-devel-bounces@lists.openembedded.org
> > [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> > Martin Jansa
> > Sent: Thursday, December 04, 2014 1:59 AM
> > To: openembedded-devel@lists.openembedded.org
> > Subject: Re: [oe] [PATCH] [Patch V2][meta-oe]dmraid: add recipe
> > 
> > On Tue, Dec 02, 2014 at 01:00:58PM +0800, Bian Naimeng wrote:
> > > There is no update anymore since 2010, but is still supported by some
> > > distro such as Ubuntu(trusty 14.04LTS).
> > 
> > Still doesn't apply, probably mangled by your e-mail client
> > 
> > OE @ ‾/meta-openembedded $ pwam 84213
> > 2014-12-03 18:54:27 URL:http://patchwork.openembedded.org/patch/84213/mbox/
> > [67143] -> "pw-am-84213.patch" [1]
> > Applying: dmraid: add recipe
> > /OE/meta-openembedded/.git/rebase-apply/patch:65: trailing whitespace.
> > 
> > /OE/meta-openembedded/.git/rebase-apply/patch:73: trailing whitespace.
> > 
> > /OE/meta-openembedded/.git/rebase-apply/patch:74: trailing whitespace.
> > 
> > /OE/meta-openembedded/.git/rebase-apply/patch:79: trailing whitespace.
> > 
> > /OE/meta-openembedded/.git/rebase-apply/patch:85: trailing whitespace.
> > 
> > fatal: corrupt patch at line 319
> > Patch failed at 0001 dmraid: add recipe
> > 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".
> > 
> > 
> > OE @ ‾/meta-openembedded $ patch -p1 < pw-am-84213.patch patching file
> > meta-oe/recipes-extended/dmraid/dmraid/01_fix_broken_linking.patch
> > patching file meta-oe/recipes-extended/dmraid/dmraid/02_disable_dmreg.patch
> > patch: **** malformed patch at line 265:
> > 
> > > +--- 1.0.0.rc16.orig/lib/.export.sym
> > > ++++ 1.0.0.rc16/lib/.export.sym
> > > +@@ -52,8 +52,6 @@ Base {
> > >
> > > + 		dso_end_rebuild;
> > >
> > > + 		hot_spare_add;
> > >
> > > + 		dso_get_members;
> > >
> > > +-		dm_register_device;
> > >
> > > +-		dm_unregister_device;
> > > + 		dm_all_monitored;
> > > + 	local:
> > >
> > > + 		*;
> > 
> > This is the broken part, and indeed there are strange blank lines in it, maybe
> > mixing dos and linux line ends in different files?
> 

> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]