All of lore.kernel.org
 help / color / mirror / Atom feed
From: Francois Perrad <fperrad@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] wsapi: fix broken patch
Date: Wed, 27 Sep 2017 10:32:24 +0200	[thread overview]
Message-ID: <20170927083224.12098-1-francois.perrad@gadz.org> (raw)

see http://autobuild.buildroot.net/results/f03/f03c9a33289ab3104f30c3da98673ad6321db46b/

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/wsapi/0001-Lua-5.3-compatibility.patch | 32 +++++++++-----------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/package/wsapi/0001-Lua-5.3-compatibility.patch b/package/wsapi/0001-Lua-5.3-compatibility.patch
index d55c81880..7cc65e116 100644
--- a/package/wsapi/0001-Lua-5.3-compatibility.patch
+++ b/package/wsapi/0001-Lua-5.3-compatibility.patch
@@ -1,21 +1,14 @@
-From 2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611 Mon Sep 17 00:00:00 2001
-From: mpeterv <mpeterval@gmail.com>
-Date: Thu, 3 Dec 2015 13:10:14 +0300
-Subject: [PATCH] Lua 5.3 compatibility
+Lua 5.3 compatibility
 
 Fetched from: https://github.com/keplerproject/wsapi/commit/2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611
 
 Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
----
- src/wsapi/ringer.lua | 1 +
- src/wsapi/util.lua   | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/src/wsapi/ringer.lua b/src/wsapi/ringer.lua
-index 58309f2..db7b68f 100644
---- a/src/wsapi/ringer.lua
-+++ b/src/wsapi/ringer.lua
-@@ -5,6 +5,7 @@ local rings = require "rings"
+Index: b/wsapi-1.6.1/src/wsapi/ringer.lua
+===================================================================
+--- a/wsapi-1.6.1/src/wsapi/ringer.lua
++++ b/wsapi-1.6.1/src/wsapi/ringer.lua
+@@ -5,6 +5,7 @@
  local _M = {}
  
  local init = [==[
@@ -23,11 +16,11 @@ index 58309f2..db7b68f 100644
    local app_name, bootstrap_code, is_file = ...
    if bootstrap_code then
      local bootstrap, err
-diff --git a/src/wsapi/util.lua b/src/wsapi/util.lua
-index 24d3cfe..34e5816 100644
---- a/src/wsapi/util.lua
-+++ b/src/wsapi/util.lua
-@@ -174,7 +174,7 @@ function _M.make_env_post(pd, type, qs)
+Index: b/wsapi-1.6.1/src/wsapi/util.lua
+===================================================================
+--- a/wsapi-1.6.1/src/wsapi/util.lua
++++ b/wsapi-1.6.1/src/wsapi/util.lua
+@@ -174,7 +174,7 @@
  end
  
  function _M.loadfile(filename, env)
@@ -36,6 +29,3 @@ index 24d3cfe..34e5816 100644
      return loadfile(filename, "bt", env)
    else
      local f, err = loadfile(filename)
--- 
-2.14.1
-
-- 
2.11.0

             reply	other threads:[~2017-09-27  8:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-27  8:32 Francois Perrad [this message]
2017-09-27  8:58 ` [Buildroot] [PATCH] wsapi: fix broken patch Thomas Petazzoni
2017-09-27 19:10   ` Arnout Vandecappelle

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=20170927083224.12098-1-francois.perrad@gadz.org \
    --to=fperrad@gmail.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 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.