All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1
@ 2017-09-24  7:59 Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 2/9] lua-curl: new package Francois Perrad
                   ` (8 more replies)
  0 siblings, 9 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luaposix/luaposix.hash |  2 +-
 package/luaposix/luaposix.mk   | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash
index e2216be73..b3984c1d1 100644
--- a/package/luaposix/luaposix.hash
+++ b/package/luaposix/luaposix.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 luaposix-33.4.0.tar.gz
+sha256 ba0bc343783fc33958cd02a68cdbfd65430152d9f297f7ed92678b1a305bd5d7  luaposix-34.0.1.tar.gz
diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
index ea3af16fb..779e707ce 100644
--- a/package/luaposix/luaposix.mk
+++ b/package/luaposix/luaposix.mk
@@ -4,11 +4,27 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 33.4.0
+LUAPOSIX_VERSION = 34.0.1
 LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
-LUAPOSIX_LICENSE_FILES = COPYING
+LUAPOSIX_LICENSE_FILES = LICENSE
 LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
-LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-$(eval $(autotools-package))
+define LUAPOSIX_BUILD_CMDS
+	(cd $(@D); \
+		$(LUA_RUN) build-aux/luke \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LUA_INCDIR=$(STAGING_DIR)/usr/include \
+	)
+endef
+
+define LUAPOSIX_INSTALL_TARGET_CMDS
+	(cd $(@D); \
+		$(LUA_RUN) build-aux/luke install \
+		INST_LIBDIR="$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
+		INST_LUADIR="$(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)" \
+	)
+endef
+
+$(eval $(generic-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/9] lua-curl: new package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 3/9] lua-datafile: " Francois Perrad
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in              |  1 +
 package/lua-curl/Config.in     |  7 +++++++
 package/lua-curl/lua-curl.hash |  2 ++
 package/lua-curl/lua-curl.mk   | 14 ++++++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 package/lua-curl/Config.in
 create mode 100644 package/lua-curl/lua-curl.hash
 create mode 100644 package/lua-curl/lua-curl.mk

diff --git a/package/Config.in b/package/Config.in
index b826bdbc3..119beabab 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -574,6 +574,7 @@ menu "Lua libraries/modules"
 	source "package/lua-coat/Config.in"
 	source "package/lua-coatpersistent/Config.in"
 	source "package/lua-csnappy/Config.in"
+	source "package/lua-curl/Config.in"
 	source "package/lua-ev/Config.in"
 	source "package/lua-flu/Config.in"
 	source "package/lua-iconv/Config.in"
diff --git a/package/lua-curl/Config.in b/package/lua-curl/Config.in
new file mode 100644
index 000000000..88cdaf10c
--- /dev/null
+++ b/package/lua-curl/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_CURL
+	bool "lua-curl"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Lua binding to libcurl.
+
+	  https://lua-curl.github.io/
diff --git a/package/lua-curl/lua-curl.hash b/package/lua-curl/lua-curl.hash
new file mode 100644
index 000000000..e73810ced
--- /dev/null
+++ b/package/lua-curl/lua-curl.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4cc6389bf5d4a868cc1e6017733b9b6306f2fc8b5083aa928d66399195697f34  lua-curl-0.3.7-1.src.rock
diff --git a/package/lua-curl/lua-curl.mk b/package/lua-curl/lua-curl.mk
new file mode 100644
index 000000000..9a35d3756
--- /dev/null
+++ b/package/lua-curl/lua-curl.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-curl
+#
+################################################################################
+
+LUA_CURL_VERSION_UPSTREAM =0.3.7
+LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1
+LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM)
+LUA_CURL_LICENSE = MIT
+LUA_CURL_LICENSE_FILES = $(LUA_CURL_SUBDIR)/LICENSE
+LUA_CURL_DEPENDENCIES = libcurl
+
+$(eval $(luarocks-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/9] lua-datafile: new package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 2/9] lua-curl: new package Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 4/9] lua-valua: " Francois Perrad
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                      |  1 +
 package/lua-datafile/Config.in         |  7 +++++++
 package/lua-datafile/lua-datafile.hash |  2 ++
 package/lua-datafile/lua-datafile.mk   | 13 +++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 package/lua-datafile/Config.in
 create mode 100644 package/lua-datafile/lua-datafile.hash
 create mode 100644 package/lua-datafile/lua-datafile.mk

diff --git a/package/Config.in b/package/Config.in
index 119beabab..767614c7d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -575,6 +575,7 @@ menu "Lua libraries/modules"
 	source "package/lua-coatpersistent/Config.in"
 	source "package/lua-csnappy/Config.in"
 	source "package/lua-curl/Config.in"
+	source "package/lua-datafile/Config.in"
 	source "package/lua-ev/Config.in"
 	source "package/lua-flu/Config.in"
 	source "package/lua-iconv/Config.in"
diff --git a/package/lua-datafile/Config.in b/package/lua-datafile/Config.in
new file mode 100644
index 000000000..e65406ed8
--- /dev/null
+++ b/package/lua-datafile/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_DATAFILE
+	bool "lua-datafile"
+	help
+	  datafile is a library for avoiding hardcoded paths
+	  when loading resource files in Lua modules.
+
+	  https://github.com/hishamhm/datafile
diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash
new file mode 100644
index 000000000..83c346eae
--- /dev/null
+++ b/package/lua-datafile/lua-datafile.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 37a33079c3476477f19de14bebd664635a39a57dd05a2709c3a402cbc1e79a6b  datafile-0.4-1.src.rock
diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk
new file mode 100644
index 000000000..75aef5290
--- /dev/null
+++ b/package/lua-datafile/lua-datafile.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-datafile
+#
+################################################################################
+
+LUA_DATAFILE_VERSION = 0.4-1
+LUA_DATAFILE_NAME_UPSTREAM = datafile
+LUA_DATAFILE_SUBDIR = datafile
+LUA_DATAFILE_LICENSE = MIT
+LUA_DATAFILE_LICENSE_FILES = $(LUA_DATAFILE_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 4/9] lua-valua: new package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 2/9] lua-curl: new package Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 3/9] lua-datafile: " Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 5/9] lua-sailor: " Francois Perrad
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                |  1 +
 package/lua-valua/Config.in      |  9 +++++++++
 package/lua-valua/lua-valua.hash |  2 ++
 package/lua-valua/lua-valua.mk   | 13 +++++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 package/lua-valua/Config.in
 create mode 100644 package/lua-valua/lua-valua.hash
 create mode 100644 package/lua-valua/lua-valua.mk

diff --git a/package/Config.in b/package/Config.in
index 767614c7d..827ab489f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -598,6 +598,7 @@ menu "Lua libraries/modules"
 	source "package/luasec/Config.in"
 	source "package/luasocket/Config.in"
 	source "package/luasql-sqlite3/Config.in"
+	source "package/lua-valua/Config.in"
 	source "package/lunit/Config.in"
 	source "package/lutok/Config.in"
 	source "package/luv/Config.in"
diff --git a/package/lua-valua/Config.in b/package/lua-valua/Config.in
new file mode 100644
index 000000000..412bb16d8
--- /dev/null
+++ b/package/lua-valua/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LUA_VALUA
+	bool "lua-valua"
+	help
+	  This module provides tools for validating values, very useful
+	  in forms, but also usable elsewhere. It works in appended chains.
+	  Create a new validation object and start chaining your test
+	  functions.
+
+	  https://github.com/sailorproject/valua
diff --git a/package/lua-valua/lua-valua.hash b/package/lua-valua/lua-valua.hash
new file mode 100644
index 000000000..92ea61311
--- /dev/null
+++ b/package/lua-valua/lua-valua.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3  valua-0.3-1.src.rock
diff --git a/package/lua-valua/lua-valua.mk b/package/lua-valua/lua-valua.mk
new file mode 100644
index 000000000..8cb0bf526
--- /dev/null
+++ b/package/lua-valua/lua-valua.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-valua
+#
+################################################################################
+
+LUA_VALUA_VERSION = 0.3-1
+LUA_VALUA_NAME_UPSTREAM = valua
+LUA_VALUA_SUBDIR = valua
+LUA_VALUA_LICENSE = MIT
+LUA_VALUA_LICENSE_FILES = $(LUA_VALUA_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 5/9] lua-sailor: new package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (2 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 4/9] lua-valua: " Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24  7:59 ` [Buildroot] [PATCH 6/9] lbase64: restore generic-package Francois Perrad
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                  |  1 +
 package/lua-sailor/Config.in       | 14 ++++++++++++++
 package/lua-sailor/lua-sailor.hash |  2 ++
 package/lua-sailor/lua-sailor.mk   | 13 +++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 package/lua-sailor/Config.in
 create mode 100644 package/lua-sailor/lua-sailor.hash
 create mode 100644 package/lua-sailor/lua-sailor.mk

diff --git a/package/Config.in b/package/Config.in
index 827ab489f..f9a9d476f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -595,6 +595,7 @@ menu "Lua libraries/modules"
 	source "package/luaossl/Config.in"
 	source "package/luaposix/Config.in"
 	source "package/lua-resty-http/Config.in"
+	source "package/lua-sailor/Config.in"
 	source "package/luasec/Config.in"
 	source "package/luasocket/Config.in"
 	source "package/luasql-sqlite3/Config.in"
diff --git a/package/lua-sailor/Config.in b/package/lua-sailor/Config.in
new file mode 100644
index 000000000..dc5a05f9f
--- /dev/null
+++ b/package/lua-sailor/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LUA_SAILOR
+	bool "lua-sailor"
+	# These are runtime dependencies
+	select BR2_PACKAGE_CGILUA
+	select BR2_PACKAGE_LBASE64
+	select BR2_PACKAGE_LUAFILESYSTEM
+	select BR2_PACKAGE_LUA_DATAFILE
+	select BR2_PACKAGE_LUA_VALUA
+	select BR2_PACKAGE_XAVANTE
+	select BR2_PACKAGE_WSAPI_XAVANTE
+	help
+	  Sailor is a web framework written in Lua that follows the MVC design pattern.
+
+	  http://sailorproject.org/
diff --git a/package/lua-sailor/lua-sailor.hash b/package/lua-sailor/lua-sailor.hash
new file mode 100644
index 000000000..f4c42cccc
--- /dev/null
+++ b/package/lua-sailor/lua-sailor.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf  sailor-0.5-4.src.rock
diff --git a/package/lua-sailor/lua-sailor.mk b/package/lua-sailor/lua-sailor.mk
new file mode 100644
index 000000000..17fbd7c61
--- /dev/null
+++ b/package/lua-sailor/lua-sailor.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-sailor
+#
+################################################################################
+
+LUA_SAILOR_VERSION = 0.5-4
+LUA_SAILOR_NAME_UPSTREAM = sailor
+LUA_SAILOR_SUBDIR = sailor
+LUA_SAILOR_LICENSE = MIT
+LUA_SAILOR_LICENSE_FILES = $(LUA_SAILOR_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 6/9] lbase64: restore generic-package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (3 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 5/9] lua-sailor: " Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24 10:51   ` Arnout Vandecappelle
  2017-09-24  7:59 ` [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1 Francois Perrad
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

with a small patch, this allows to support all Lua versions.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 .../lbase64/0001-retro-compatible-with-Lua-5.1.patch | 20 ++++++++++++++++++++
 package/lbase64/Config.in                            |  7 +------
 package/lbase64/lbase64.hash                         |  2 +-
 package/lbase64/lbase64.mk                           | 19 +++++++++++++++----
 4 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 package/lbase64/0001-retro-compatible-with-Lua-5.1.patch

diff --git a/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch b/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
new file mode 100644
index 000000000..12acf4483
--- /dev/null
+++ b/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
@@ -0,0 +1,20 @@
+retro compatible with Lua 5.1 C/API
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/lbase64.c
+===================================================================
+--- a/lbase64.c
++++ b/lbase64.c
+@@ -111,7 +111,11 @@
+ 
+ LUALIB_API int luaopen_base64(lua_State *L)
+ {
++#if LUA_VERSION_NUM >= 502
+  luaL_newlib(L,R);
++#else
++ luaL_register(L,MYNAME,R);
++#endif
+  lua_pushliteral(L,"version");			/** version */
+  lua_pushliteral(L,MYVERSION);
+  lua_settable(L,-3);
diff --git a/package/lbase64/Config.in b/package/lbase64/Config.in
index 5ef91bf30..34ef943aa 100644
--- a/package/lbase64/Config.in
+++ b/package/lbase64/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_LBASE64
 	bool "lbase64"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	help
 	  A base64 library for Lua
 
-	  http://luaforge.net/projects/lbase64/
-
-comment "lbase64 needs a Lua 5.1 interpreter"
-	depends on !BR2_PACKAGE_LUA_5_1
-	depends on !BR2_PACKAGE_LUAJIT
+	  http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/#lbase64
diff --git a/package/lbase64/lbase64.hash b/package/lbase64/lbase64.hash
index 080609037..d835d40b2 100644
--- a/package/lbase64/lbase64.hash
+++ b/package/lbase64/lbase64.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	7326658d48a70382b496eb88220b0c398c19ed712e39863939330fec0533362a  lbase64-20120820-1.src.rock
+sha256 b83dbc87330a322e5222cd891a6e258b533f5b6c46e8f3c18fc0265e4c991aaa  lbase64.tar.gz
diff --git a/package/lbase64/lbase64.mk b/package/lbase64/lbase64.mk
index 80e880079..fd78a6ccd 100644
--- a/package/lbase64/lbase64.mk
+++ b/package/lbase64/lbase64.mk
@@ -4,9 +4,20 @@
 #
 ################################################################################
 
-LBASE64_VERSION = 20120820-1
-LBASE64_SUBDIR = base64
+LBASE64_VERSION = 20120820
+LBASE64_SITE = http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.3
+LBASE64_SOURCE = lbase64.tar.gz
 LBASE64_LICENSE = Public domain
-LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README
+LBASE64_LICENSE_FILES = README
+LBASE64_DEPENDENCIES = luainterpreter
 
-$(eval $(luarocks-package))
+define LBASE64_BUILD_CMDS
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) so
+endef
+
+define LBASE64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/base64.so \
+		$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/base64.so
+endef
+
+$(eval $(generic-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (4 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 6/9] lbase64: restore generic-package Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24 10:53   ` Arnout Vandecappelle
  2017-09-24  7:59 ` [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility Francois Perrad
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/orbit/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/orbit/Config.in b/package/orbit/Config.in
index 2953499e7..c35c475e8 100644
--- a/package/orbit/Config.in
+++ b/package/orbit/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ORBIT
 	bool "orbit"
+	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	# These are runtime dependencies
 	select BR2_PACKAGE_LPEG
 	select BR2_PACKAGE_LUAFILESYSTEM
@@ -9,3 +10,7 @@ config BR2_PACKAGE_ORBIT
 	  Ruby frameworks such as Camping
 
 	  http://keplerproject.github.com/orbit
+
+comment "orbit needs a Lua 5.1 interpreter"
+	depends on !BR2_PACKAGE_LUA_5_1
+	depends on !BR2_PACKAGE_LUAJIT
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (5 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1 Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24 10:53   ` Arnout Vandecappelle
  2017-09-24  7:59 ` [Buildroot] [PATCH 9/9] lua-markdown: new package Francois Perrad
  2017-09-24 10:23 ` [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Arnout Vandecappelle
  8 siblings, 1 reply; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/wsapi/0001-lua-5.3-compatibility.patch | 31 ++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/wsapi/0001-lua-5.3-compatibility.patch

diff --git a/package/wsapi/0001-lua-5.3-compatibility.patch b/package/wsapi/0001-lua-5.3-compatibility.patch
new file mode 100644
index 000000000..31b532736
--- /dev/null
+++ b/package/wsapi/0001-lua-5.3-compatibility.patch
@@ -0,0 +1,31 @@
+Lua 5.3 compatibility
+
+Fetch from: https://github.com/keplerproject/wsapi/commit/2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+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 = [==[
++  local loadstring = loadstring or load
+   local app_name, bootstrap_code, is_file = ...
+   if bootstrap_code then
+     local bootstrap, err
+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)
+-  if _VERSION == "Lua 5.2" then
++  if _VERSION ~= "Lua 5.1" then
+     return loadfile(filename, "bt", env)
+   else
+     local f, err = loadfile(filename)
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 9/9] lua-markdown: new package
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (6 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility Francois Perrad
@ 2017-09-24  7:59 ` Francois Perrad
  2017-09-24 10:23 ` [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Arnout Vandecappelle
  8 siblings, 0 replies; 15+ messages in thread
From: Francois Perrad @ 2017-09-24  7:59 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                     |  1 +
 package/lua-markdown/Config.in        |  7 +++++++
 package/lua-markdown/lua-mardown.hash |  2 ++
 package/lua-markdown/lua-mardown.mk   | 13 +++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 package/lua-markdown/Config.in
 create mode 100644 package/lua-markdown/lua-mardown.hash
 create mode 100644 package/lua-markdown/lua-mardown.mk

diff --git a/package/Config.in b/package/Config.in
index f9a9d476f..c8392eb69 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -579,6 +579,7 @@ menu "Lua libraries/modules"
 	source "package/lua-ev/Config.in"
 	source "package/lua-flu/Config.in"
 	source "package/lua-iconv/Config.in"
+	source "package/lua-markdown/Config.in"
 	source "package/lua-messagepack/Config.in"
 	source "package/lua-msgpack-native/Config.in"
 	source "package/lua-periphery/Config.in"
diff --git a/package/lua-markdown/Config.in b/package/lua-markdown/Config.in
new file mode 100644
index 000000000..c53dc4606
--- /dev/null
+++ b/package/lua-markdown/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_MARKDOWN
+	bool "lua-markdown"
+	help
+	  A pure-lua implementation of the Markdown text-to-html
+	  markup system.
+
+	  https://github.com/mpeterv/markdown
diff --git a/package/lua-markdown/lua-mardown.hash b/package/lua-markdown/lua-mardown.hash
new file mode 100644
index 000000000..9bfbf6007
--- /dev/null
+++ b/package/lua-markdown/lua-mardown.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07  markdown-0.33-1.src.rock
diff --git a/package/lua-markdown/lua-mardown.mk b/package/lua-markdown/lua-mardown.mk
new file mode 100644
index 000000000..a98f3125a
--- /dev/null
+++ b/package/lua-markdown/lua-mardown.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-markdown
+#
+################################################################################
+
+LUA_MARKDOWN_VERSION = 0.33-1
+LUA_MARKDOWN_NAME_UPSTREAM = markdown
+LUA_MARKDOWN_SUBDIR = markdown
+LUA_MARKDOWN_LICENSE = MIT
+LUA_MARKDOWN_LICENSE_FILES = $(LUA_MARKDOWN_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1
  2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
                   ` (7 preceding siblings ...)
  2017-09-24  7:59 ` [Buildroot] [PATCH 9/9] lua-markdown: new package Francois Perrad
@ 2017-09-24 10:23 ` Arnout Vandecappelle
  2017-09-24 14:03   ` François Perrad
  8 siblings, 1 reply; 15+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 10:23 UTC (permalink / raw)
  To: buildroot

 Hi Francois,

On 24-09-17 09:59, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/luaposix/luaposix.hash |  2 +-
>  package/luaposix/luaposix.mk   | 24 ++++++++++++++++++++----
>  2 files changed, 21 insertions(+), 5 deletions(-)
> 
> diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.hash
> index e2216be73..b3984c1d1 100644
> --- a/package/luaposix/luaposix.hash
> +++ b/package/luaposix/luaposix.hash
> @@ -1,2 +1,2 @@
>  # Locally calculated
> -sha256 e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 luaposix-33.4.0.tar.gz
> +sha256 ba0bc343783fc33958cd02a68cdbfd65430152d9f297f7ed92678b1a305bd5d7  luaposix-34.0.1.tar.gz
> diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
> index ea3af16fb..779e707ce 100644
> --- a/package/luaposix/luaposix.mk
> +++ b/package/luaposix/luaposix.mk
> @@ -4,11 +4,27 @@
>  #
>  ################################################################################
>  
> -LUAPOSIX_VERSION = 33.4.0
> +LUAPOSIX_VERSION = 34.0.1
>  LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
>  LUAPOSIX_LICENSE = MIT
> -LUAPOSIX_LICENSE_FILES = COPYING
> +LUAPOSIX_LICENSE_FILES = LICENSE
>  LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
> -LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
>  
> -$(eval $(autotools-package))
> +define LUAPOSIX_BUILD_CMDS
> +	(cd $(@D); \
> +		$(LUA_RUN) build-aux/luke \
> +		CC="$(TARGET_CC)" \
> +		CFLAGS="$(TARGET_CFLAGS)" \
> +		LUA_INCDIR=$(STAGING_DIR)/usr/include \
> +	)

 Since you're anyway switching the build system, why not convert it to a
luarocks package?

 Regards,
 Arnout

> +endef
> +
> +define LUAPOSIX_INSTALL_TARGET_CMDS
> +	(cd $(@D); \
> +		$(LUA_RUN) build-aux/luke install \
> +		INST_LIBDIR="$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
> +		INST_LUADIR="$(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)" \
> +	)
> +endef
> +
> +$(eval $(generic-package))
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 6/9] lbase64: restore generic-package
  2017-09-24  7:59 ` [Buildroot] [PATCH 6/9] lbase64: restore generic-package Francois Perrad
@ 2017-09-24 10:51   ` Arnout Vandecappelle
  0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 10:51 UTC (permalink / raw)
  To: buildroot



On 24-09-17 09:59, Francois Perrad wrote:
> with a small patch, this allows to support all Lua versions.
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

 Applied to master with a more extended commit log, thanks.

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1
  2017-09-24  7:59 ` [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1 Francois Perrad
@ 2017-09-24 10:53   ` Arnout Vandecappelle
  0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 10:53 UTC (permalink / raw)
  To: buildroot



On 24-09-17 09:59, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>


 Applied to master, thanks.

 I was looking for an autobuild failure, but of course we only test Lua 5.1 in
the autobuilders. If you feel up to it, you could add a randomizer for the Lua
version to utils/genrandconfig.

 Regards,
 Arnout

> ---
>  package/orbit/Config.in | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/orbit/Config.in b/package/orbit/Config.in
> index 2953499e7..c35c475e8 100644
> --- a/package/orbit/Config.in
> +++ b/package/orbit/Config.in
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_ORBIT
>  	bool "orbit"
> +	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
>  	# These are runtime dependencies
>  	select BR2_PACKAGE_LPEG
>  	select BR2_PACKAGE_LUAFILESYSTEM
> @@ -9,3 +10,7 @@ config BR2_PACKAGE_ORBIT
>  	  Ruby frameworks such as Camping
>  
>  	  http://keplerproject.github.com/orbit
> +
> +comment "orbit needs a Lua 5.1 interpreter"
> +	depends on !BR2_PACKAGE_LUA_5_1
> +	depends on !BR2_PACKAGE_LUAJIT
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility
  2017-09-24  7:59 ` [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility Francois Perrad
@ 2017-09-24 10:53   ` Arnout Vandecappelle
  0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 10:53 UTC (permalink / raw)
  To: buildroot



On 24-09-17 09:59, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

 Applied to master after converting the patch to git formatting, thanks.

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1
  2017-09-24 10:23 ` [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Arnout Vandecappelle
@ 2017-09-24 14:03   ` François Perrad
  2017-09-24 15:27     ` Arnout Vandecappelle
  0 siblings, 1 reply; 15+ messages in thread
From: François Perrad @ 2017-09-24 14:03 UTC (permalink / raw)
  To: buildroot

2017-09-24 12:23 GMT+02:00 Arnout Vandecappelle <arnout@mind.be>:

>  Hi Francois,
>
> On 24-09-17 09:59, Francois Perrad wrote:
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/luaposix/luaposix.hash |  2 +-
> >  package/luaposix/luaposix.mk   | 24 ++++++++++++++++++++----
> >  2 files changed, 21 insertions(+), 5 deletions(-)
> >
> > diff --git a/package/luaposix/luaposix.hash b/package/luaposix/luaposix.
> hash
> > index e2216be73..b3984c1d1 100644
> > --- a/package/luaposix/luaposix.hash
> > +++ b/package/luaposix/luaposix.hash
> > @@ -1,2 +1,2 @@
> >  # Locally calculated
> > -sha256 e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21
> luaposix-33.4.0.tar.gz
> > +sha256 ba0bc343783fc33958cd02a68cdbfd65430152d9f297f7ed92678b1a305bd5d7
> luaposix-34.0.1.tar.gz
> > diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
> > index ea3af16fb..779e707ce 100644
> > --- a/package/luaposix/luaposix.mk
> > +++ b/package/luaposix/luaposix.mk
> > @@ -4,11 +4,27 @@
> >  #
> >  ############################################################
> ####################
> >
> > -LUAPOSIX_VERSION = 33.4.0
> > +LUAPOSIX_VERSION = 34.0.1
> >  LUAPOSIX_SITE = $(call github,luaposix,luaposix,
> release-v$(LUAPOSIX_VERSION))
> >  LUAPOSIX_LICENSE = MIT
> > -LUAPOSIX_LICENSE_FILES = COPYING
> > +LUAPOSIX_LICENSE_FILES = LICENSE
> >  LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
> > -LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)"
> --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
> >
> > -$(eval $(autotools-package))
> > +define LUAPOSIX_BUILD_CMDS
> > +     (cd $(@D); \
> > +             $(LUA_RUN) build-aux/luke \
> > +             CC="$(TARGET_CC)" \
> > +             CFLAGS="$(TARGET_CFLAGS)" \
> > +             LUA_INCDIR=$(STAGING_DIR)/usr/include \
> > +     )
>
>  Since you're anyway switching the build system, why not convert it to a
> luarocks package?
>
>
luaposix have a rockspec, but not suitable for BR.
Because our luarocks infrastructure handles only the type=builtin which
represents almost 90% of all rockspec.

Fran?ois


>  Regards,
>  Arnout
>
> > +endef
> > +
> > +define LUAPOSIX_INSTALL_TARGET_CMDS
> > +     (cd $(@D); \
> > +             $(LUA_RUN) build-aux/luke install \
> > +             INST_LIBDIR="$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)"
> \
> > +             INST_LUADIR="$(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
> \
> > +     )
> > +endef
> > +
> > +$(eval $(generic-package))
> >
>
> --
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170924/59c200ef/attachment.html>

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1
  2017-09-24 14:03   ` François Perrad
@ 2017-09-24 15:27     ` Arnout Vandecappelle
  0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 15:27 UTC (permalink / raw)
  To: buildroot



On 24-09-17 16:03, Fran?ois Perrad wrote:
> 
> luaposix have a rockspec, but not suitable for BR.
> Because our luarocks infrastructure handles only the type=builtin which
> represents almost 90% of all rockspec.
 OK. Would have been nice to mention this in the commit message.

 I pushed the rest of the series, with still a few things I had to fix up:

- In lua-libcurl, there was a space missing after the = in one of the assignments.
- In lua-valua and lua-sailor, the help text was not wrapped at 72 columns.
check-package caught this.
- In lua-markdown, the .mk and .hash file were called lua-mardown (missing a k).
check-package caught this as well.

 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-09-24 15:27 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-24  7:59 [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Francois Perrad
2017-09-24  7:59 ` [Buildroot] [PATCH 2/9] lua-curl: new package Francois Perrad
2017-09-24  7:59 ` [Buildroot] [PATCH 3/9] lua-datafile: " Francois Perrad
2017-09-24  7:59 ` [Buildroot] [PATCH 4/9] lua-valua: " Francois Perrad
2017-09-24  7:59 ` [Buildroot] [PATCH 5/9] lua-sailor: " Francois Perrad
2017-09-24  7:59 ` [Buildroot] [PATCH 6/9] lbase64: restore generic-package Francois Perrad
2017-09-24 10:51   ` Arnout Vandecappelle
2017-09-24  7:59 ` [Buildroot] [PATCH 7/9] orbit: mark as only with Lua 5.1 Francois Perrad
2017-09-24 10:53   ` Arnout Vandecappelle
2017-09-24  7:59 ` [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility Francois Perrad
2017-09-24 10:53   ` Arnout Vandecappelle
2017-09-24  7:59 ` [Buildroot] [PATCH 9/9] lua-markdown: new package Francois Perrad
2017-09-24 10:23 ` [Buildroot] [PATCH 1/9] luaposix: bump to version 34.0.1 Arnout Vandecappelle
2017-09-24 14:03   ` François Perrad
2017-09-24 15:27     ` Arnout Vandecappelle

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.