From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH] [Patch V2][meta-oe]dmraid: add recipe
Date: Wed, 3 Dec 2014 18:58:38 +0100 [thread overview]
Message-ID: <20141203175838.GE2455@jama> (raw)
In-Reply-To: <1417496458-47021-1-git-send-email-biannm@cn.fujitsu.com>
[-- Attachment #1: Type: text/plain, Size: 1877 bytes --]
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?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
next prev parent reply other threads:[~2014-12-03 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 5:00 [PATCH] [Patch V2][meta-oe]dmraid: add recipe Bian Naimeng
2014-12-03 17:58 ` Martin Jansa [this message]
2014-12-04 6:09 ` Bian, Naimeng
2014-12-04 12:15 ` Martin Jansa
2014-12-05 2:33 ` Bian, Naimeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141203175838.GE2455@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.