Skip to contentSkip to conversation

lua: remove 5.2.x version

PATCH New Francois Perrad 3 participants 4 messages Dec 2, 2018 – Dec 9, 2018

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH v3 1/1 lua: remove 5.2.x version

At this time :
- Lua 5.3.5 will be the last one of its serie.
- Lua 5.4 is up coming (lua-5.4.0-work2 is already available).
- Lua 5.2.4 was released on 2015.
For various reasons in the Lua ecosystem, the Lua 5.1 will stay. On BR, Lua 5.3 is the default version since 2016.02.

So, the serie which could be removed is the 5.2.x. We could wait some days for other user feedback.

Note: see discussion when 5.3.x was introduced : http://lists.busybox.net/pipermail/buildroot/2015-January/117638.html

v2 --> v3
- rebase on top of BR 2018.11

Signed-off-by Francois Perrad <[email protected]>
---
 Config.in.legacy                              |  9 +++
 package/domoticz/Config.in                    |  4 +-
 package/lrandom/lrandom.mk                    |  2 +-
 package/lua/5.2.4/0001-root-path.patch        | 17 ----
 .../lua/5.2.4/0002-shared-libs-for-lua.patch  | 78 -------------------
 package/lua/5.2.4/0011-linenoise.patch        | 26 -------
 package/lua/Config.in                         |  4 -
 package/lua/lua.hash                          |  3 -
 package/lua/lua.mk                            | 10 +--
 package/mpv/mpv.mk                            |  2 +-
 package/wireshark/wireshark.mk                |  2 +-
 11 files changed, 15 insertions(+), 142 deletions(-)
 delete mode 100644 package/lua/5.2.4/0001-root-path.patch
 delete mode 100644 package/lua/5.2.4/0002-shared-libs-for-lua.patch
 delete mode 100644 package/lua/5.2.4/0011-linenoise.patch
Config.in.legacy +9 -0
index a5e0c9fe4..bfbe98d73 100644
@@ -143,6 +143,15 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2019.02"
+
+config BR2_PACKAGE_LUA_5_2
+	bool "Lua 5.2.x version removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LUA_5_3
+	help
+	  The Lua 5.2.x version was removed.
+
 comment "Legacy options removed in 2018.11"
 
 config BR2_TARGET_XLOADER
package/domoticz/Config.in +2 -2
index 4c5338df0..6d0abaddf 100644
@@ -8,7 +8,7 @@ config BR2_PACKAGE_DOMOTICZ
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
+	depends on BR2_PACKAGE_LUA_5_3
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_DATE_TIME

@@ -35,7 +35,7 @@ comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, gcc >= 4.8, NPTL, wch
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
-		!(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3)
+		!BR2_PACKAGE_LUA_5_3
 
 comment "domoticz needs exception_ptr"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
package/lrandom/lrandom.mk +1 -1
index 09b62c94a..2fe5fdb5a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y)
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LRANDOM_VERSION = 20120430.52-1
 else
 LRANDOM_VERSION = 20120430.51-1
package/lua/5.2.4/0001-root-path.patch deleted +0 -17
deleted file mode 100644
index c6f242c20..000000000
@@ -1,17 +0,0 @@
-Adjust installation location to /usr.
-
-Signed-off-by: Francois Perrad <[email protected]>
-
-Index: b/src/luaconf.h
-===================================================================
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -100,7 +100,7 @@
- #else			/* }{ */
- 
- #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
- #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
- #define LUA_PATH_DEFAULT  \
package/lua/5.2.4/0002-shared-libs-for-lua.patch deleted +0 -78

78 lines not on this page · raw message

package/lua/5.2.4/0011-linenoise.patch deleted +0 -26
deleted file mode 100644
index b1f228cd4..000000000
@@ -1,26 +0,0 @@
-Add support of linenoise (replace readline)
-
-see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html
-
-Signed-off-by: Francois Perrad <[email protected]>
-
-Index: b/src/lua.c
-===================================================================
---- a/src/lua.c
-+++ b/src/lua.c
-@@ -72,6 +72,15 @@
-           add_history(lua_tostring(L, idx));  /* add it to history */
- #define lua_freeline(L,b)	((void)L, free(b))
- 
-+#elif defined(LUA_USE_LINENOISE)
-+
-+#include <linenoise.h>
-+#define lua_readline(L,b,p)	((void)L, ((b)=linenoise(p)) != NULL)
-+#define lua_saveline(L,idx) \
-+	if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
-+	  linenoiseHistoryAdd(lua_tostring(L, idx));  /* add it to history */
-+#define lua_freeline(L,b)	((void)L, free(b))
-+
- #elif !defined(lua_readline)
- 
- #define lua_readline(L,b,p) \
package/lua/Config.in +0 -4
index 4d2f0e90f..ce2e439f6 100644
@@ -21,9 +21,6 @@ choice
 config BR2_PACKAGE_LUA_5_1
 	bool "Lua 5.1.x"
 
-config BR2_PACKAGE_LUA_5_2
-	bool "Lua 5.2.x"
-
 config BR2_PACKAGE_LUA_5_3
 	bool "Lua 5.3.x"
 

@@ -31,7 +28,6 @@ endchoice
 
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
 	default "5.1"	if BR2_PACKAGE_LUA_5_1
-	default "5.2"	if BR2_PACKAGE_LUA_5_2
 	default "5.3"	if BR2_PACKAGE_LUA_5_3
 
 if BR2_PACKAGE_LUA_5_3
package/lua/lua.hash +0 -3
index 43f5be275..ba57304d0 100644
@@ -2,8 +2,5 @@
 md5 4f4b4f323fd3514a68e0ab3da8ce3455           lua-5.3.5.tar.gz
 sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447  lua-5.3.5.tar.gz
 
-md5 913fdb32207046b273fdb17aad70be13           lua-5.2.4.tar.gz
-sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf  lua-5.2.4.tar.gz
-
 md5 2e115fe26e435e33b0d5c022e4490567           lua-5.1.5.tar.gz
 sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc  lua-5.1.5.tar.gz
package/lua/lua.mk +1 -9
index 22643c4c8..8a5f9258a 100644
@@ -7,16 +7,12 @@
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_VERSION = 5.3.5
 else
-ifeq ($(BR2_PACKAGE_LUA_5_2),y)
-LUA_VERSION = 5.2.4
-else
 LUA_VERSION = 5.1.5
 endif
-endif
 LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
 LUA_LICENSE = MIT
-ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y)
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_LICENSE_FILES = doc/readme.html
 else
 LUA_LICENSE_FILES = COPYRIGHT

@@ -26,10 +22,6 @@ LUA_PROVIDES = luainterpreter
 
 LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
 
-ifeq ($(BR2_PACKAGE_LUA_5_2),y)
-LUA_CFLAGS += -DLUA_COMPAT_ALL
-endif
-
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_CFLAGS += -DLUA_COMPAT_5_2
 endif
package/mpv/mpv.mk +1 -1
index b8260213b..3ab267377 100644
@@ -132,7 +132,7 @@ endif
 
 # LUA support, only for lua51/lua52/luajit
 # This enables the controller (OSD) together with libass
-ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUAJIT),y)
+ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUAJIT),y)
 MPV_CONF_OPTS += --enable-lua
 MPV_DEPENDENCIES += luainterpreter
 else
package/wireshark/wireshark.mk +1 -1
index 4720960e5..3b83389c1 100644
@@ -107,7 +107,7 @@ WIRESHARK_CONF_OPTS += --without-libxml2
 endif
 
 # no support for lua53 yet
-ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2),y)
+ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 WIRESHARK_CONF_OPTS += --with-lua
 WIRESHARK_DEPENDENCIES += lua
 else
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/1 lua: remove 5.2.x version

Hello Fran?ois,

Quoted 11 lines · Francois Perrad

At this time :
- Lua 5.3.5 will be the last one of its serie.
- Lua 5.4 is up coming (lua-5.4.0-work2 is already available).
- Lua 5.2.4 was released on 2015.
For various reasons in the Lua ecosystem, the Lua 5.1 will stay. On BR, Lua 5.3 is the default version since 2016.02.

So, the serie which could be removed is the 5.2.x. We could wait some days for other user feedback.

Note: see discussion when 5.3.x was introduced : http://lists.busybox.net/pipermail/buildroot/2015-January/117638.html

One quick question: Prosody 0.11 has been released, and they say:

"""
Prosody has traditionally used Lua 5.1. As we announced back when 0.10 was released, we are on the path to updating to more recent Lua versions.

The recommended Lua version for 0.11 is Lua 5.2, while Lua 5.1 is still supported for the platforms that need it.
"""

Should we keep Lua 5.2 for Prosody ?

Quoted 2 lines

v2 --> v3
- rebase on top of BR 2018.11

The changelog should go...

Quoted 3 lines
Signed-off-by Francois Perrad <[email protected]>

---

... here. Otherwise, it becomes part of the commit log when applying, which we don't want.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v3 1/1 lua: remove 5.2.x version

Le lun. 3 d?c. 2018 ? 22:28, Thomas Petazzoni <[email protected]> a ?crit :

Quoted 23 lines

Hello Fran?ois,

Quoted 11 lines · Francois Perrad

At this time :
- Lua 5.3.5 will be the last one of its serie.
- Lua 5.4 is up coming (lua-5.4.0-work2 is already available).
- Lua 5.2.4 was released on 2015.
For various reasons in the Lua ecosystem, the Lua 5.1 will stay. On BR, Lua 5.3 is the default version since 2016.02.

So, the serie which could be removed is the 5.2.x. We could wait some days for other user feedback.

Note: see discussion when 5.3.x was introduced :

http://lists.busybox.net/pipermail/buildroot/2015-January/117638.html

One quick question: Prosody 0.11 has been released, and they say:

"""
Prosody has traditionally used Lua 5.1. As we announced back when 0.10 was released, we are on the path to updating to more recent Lua versions.

Quoted 7 lines

The recommended Lua version for 0.11 is Lua 5.2, while Lua 5.1 is still supported for the platforms that need it.
"""

Should we keep Lua 5.2 for Prosody ?

I am aware on this announcement.

Now, see the note in the commit log of
https://patchwork.ozlabs.org/patch/1002646/ from my serie "support/testing:
Lua and friends"
So currently, the BR users of Prosody only use LuaJIT, (Lua 5.1 & 5.2 don't work on BR, Lua 5.3 is not supported by Prosody).

LuaJIT is ABI compatible with Lua 5.1, and has some extensions from Lua 5.2 & 5.3.
I think that the Prosody team knows that their user base is mostly on LuaJIT.
I also think that the official support of Lua 5.2 is a first step for the Prosody team, they will target Lua 5.3.

In conclusion, I still want to remove Lua 5.2

Fran?ois

Quoted 14 lines

v2 --> v3

Quoted 1 line

- rebase on top of BR 2018.11

The changelog should go...

Quoted 3 lines
Signed-off-by Francois Perrad <[email protected]>

---

... here. Otherwise, it becomes part of the commit log when applying, which we don't want.

Thanks!

Quoted 10 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
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/20181204/3ae4b100/attachment.html>

#3 lore raw

PATCH v3 1/1 lua: remove 5.2.x version

In reply to Francois Perrad

Hello,

Quoted 11 lines · Francois Perrad

At this time :
- Lua 5.3.5 will be the last one of its serie.
- Lua 5.4 is up coming (lua-5.4.0-work2 is already available).
- Lua 5.2.4 was released on 2015.
For various reasons in the Lua ecosystem, the Lua 5.1 will stay. On BR, Lua 5.3 is the default version since 2016.02.

So, the serie which could be removed is the 5.2.x. We could wait some days for other user feedback.

Note: see discussion when 5.3.x was introduced : http://lists.busybox.net/pipermail/buildroot/2015-January/117638.html

I've applied, after fixing one small aspect, see below.

package/domoticz/Config.in comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, gcc >= 4.8, NPTL, wch

Quoted 14 lines
package/domoticz/Config.in +1 -1
index 4c5338df0..6d0abaddf 100644
@@ -8,7 +8,7 @@ config BR2_PACKAGE_DOMOTICZ
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
+	depends on BR2_PACKAGE_LUA_5_3
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_DATE_TIME

@@ -35,7 +35,7 @@ comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, gcc >= 4.8, NPTL, wch

You forgot to update this comment: saying lua >= 5.2 no longer makes sense, so I've updated that to "domoticz needs lua 5.3".

Applied with this change. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com