Skip to contentSkip to conversation

wsapi: fix broken patch

PATCH New Francois Perrad 2 participants 2 messages Sep 27, 2017

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH v2 1/1 wsapi: fix broken patch

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

Signed-off-by Francois Perrad <[email protected]>
---
 package/wsapi/0001-Lua-5.3-compatibility.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
package/wsapi/0001-Lua-5.3-compatibility.patch +6 -6
index d55c81880..9165ef2b9 100644
@@ -11,10 +11,10 @@ Signed-off-by: Francois Perrad <[email protected]>
  src/wsapi/util.lua   | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/src/wsapi/ringer.lua b/src/wsapi/ringer.lua
+diff --git a/wsapi-1.6.1/src/wsapi/ringer.lua b/wsapi-1.6.1/src/wsapi/ringer.lua
 index 58309f2..db7b68f 100644
---- a/src/wsapi/ringer.lua
-+++ b/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 rings = require "rings"
  local _M = {}
  

@@ -23,10 +23,10 @@ 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
+diff --git a/wsapi-1.6.1/src/wsapi/util.lua b/wsapi-1.6.1/src/wsapi/util.lua
 index 24d3cfe..34e5816 100644
---- a/src/wsapi/util.lua
-+++ b/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 @@ function _M.make_env_post(pd, type, qs)
  end
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH v2 1/1 wsapi: fix broken patch

Hello,

Quoted 6 lines · Francois Perrad

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

Signed-off-by Francois Perrad <[email protected]>
---
 package/wsapi/0001-Lua-5.3-compatibility.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com