From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] lua: bump to version 5.3.2
Date: Tue, 1 Dec 2015 17:58:32 +0100 [thread overview]
Message-ID: <20151201175832.237f4de3@free-electrons.com> (raw)
In-Reply-To: <1448912908-6459-1-git-send-email-francois.perrad@gadz.org>
Fran?ois,
On Mon, 30 Nov 2015 20:48:28 +0100, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch | 0
> package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch | 0
> package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch | 2 +-
> package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch | 6 ++----
> package/lua/lua.hash | 4 ++--
> package/lua/lua.mk | 2 +-
> 6 files changed, 7 insertions(+), 9 deletions(-)
> rename package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch (100%)
> rename package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch (100%)
> rename package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch (97%)
> rename package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch (78%)
I didn't look at the details, but this patch doesn't apply here (on
either next or master) :
thomas at skate:~/projets/buildroot (next)$ git pwam 550316
Applying patch #550316 using 'git am -s -3'
Description: lua: bump to version 5.3.2
Applying: lua: bump to version 5.3.2
Using index info to reconstruct a base tree...
error: patch failed: package/lua/5.3.1/0011-linenoise.patch:8
error: package/lua/5.3.1/0011-linenoise.patch: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 lua: bump to version 5.3.2
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".
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
prev parent reply other threads:[~2015-12-01 16:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 19:48 [Buildroot] [PATCH] lua: bump to version 5.3.2 Francois Perrad
2015-12-01 16:58 ` Thomas Petazzoni [this message]
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=20151201175832.237f4de3@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