From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.7.0
Date: Sat, 3 Jun 2017 17:11:52 +0200 [thread overview]
Message-ID: <20170603171152.3f5f47ab@free-electrons.com> (raw)
In-Reply-To: <20170603131253.10900-1-bernd.kuhls@t-online.de>
Hello,
On Sat, 3 Jun 2017 15:12:53 +0200, Bernd Kuhls wrote:
> Commit https://git.nlnetlabs.nl/ldns/commit/host2str.c?id=f7b3a9700e91f8e46477f335c5aaac7c6cdd8acb
> added compatability with openssl 1.1.0 but, at the same time, breaks
> build without openssl:
When I try to apply this patch, I get:
thomas at skate:~/projets/buildroot (master)$ git pwam 770780
Applying patch #770780 using 'git am -s'
Description: [1/1] package/libldns: bump version to 1.7.0
Applying: package/libldns: bump version to 1.7.0
fatal: corrupt patch at line 704
Patch failed at 0001 package/libldns: bump version to 1.7.0
The copy of the patch that failed is found in: .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".
'git am' failed with exit status 128
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
next prev parent reply other threads:[~2017-06-03 15:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-03 13:12 [Buildroot] [PATCH 1/1] package/libldns: bump version to 1.7.0 Bernd Kuhls
2017-06-03 15:11 ` Thomas Petazzoni [this message]
2017-06-03 16:05 ` Bernd Kuhls
2017-06-05 10:05 ` Thomas Petazzoni
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=20170603171152.3f5f47ab@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox