package/lua-zlib: new package
PATCH 1/2 package/lua-zlib: new package
this module is compatible with lzlib (which is no longer maintained).
--- package/Config.in | 1 + package/lua-zlib/Config.in | 10 ++++++++ package/lua-zlib/lua-zlib.hash | 2 ++ package/lua-zlib/lua-zlib.mk | 12 +++++++++ .../testing/tests/package/test_lua_zlib.py | 25 +++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/lua-zlib/Config.in create mode 100644 package/lua-zlib/lua-zlib.hash create mode 100644 package/lua-zlib/lua-zlib.mk create mode 100644 support/testing/tests/package/test_lua_zlib.py
package/Config.in +1 -0
@@ -689,6 +689,7 @@ menu "Lua libraries/modules" source "package/lua-testmore/Config.in" source "package/lua-utf8/Config.in" source "package/lua-valua/Config.in" + source "package/lua-zlib/Config.in" source "package/luabitop/Config.in" source "package/luadbi/Config.in" source "package/luadbi-sqlite3/Config.in"
package/lua-zlib/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LUA_ZLIB + bool "lua-zlib" + select BR2_PACKAGE_ZLIB + help + Simple streaming interface to zlib for Lua. + Consists of two functions: inflate and deflate. + Both functions return "stream functions" (takes a buffer + of input and returns a buffer of output). + + https://github.com/brimworks/lua-zlib
package/lua-zlib/lua-zlib.hash new file +2 -0
@@ -0,0 +1,2 @@ +# computed by luarocks/buildroot +sha256 42436ba2b78c9a2d515d6da59ceb12cdea7f84c9ce3c859d91addb42badd4061 lua-zlib-1.2-0.src.rock
package/lua-zlib/lua-zlib.mk new file +12 -0
@@ -0,0 +1,12 @@ +################################################################################ +# +# lua-zlib +# +################################################################################ + +LUA_ZLIB_VERSION = 1.2-0 +LUA_ZLIB_SUBDIR = lua-zlib +LUA_ZLIB_LICENSE = MIT +LUA_ZLIB_DEPENDENCIES = zlib + +$(eval $(luarocks-package))
support/testing/tests/package/test_lua_zlib.py new file +25 -0
@@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuazlib(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_ZLIB=y + """ + + def test_run(self): + self.login() + self.module_test("zlib") + + +class TestLuajitLuazlib(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_ZLIB=y + """ + + def test_run(self): + self.login() + self.module_test("zlib")
Signature · 1 line
2.30.2
PATCH 2/2 package/lzlib: remove it
--- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/lzlib/Config.in | 10 ---------- package/lzlib/lzlib.hash | 3 --- package/lzlib/lzlib.mk | 15 --------------- support/testing/tests/package/test_lzlib.py | 14 -------------- 6 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 package/lzlib/Config.in delete mode 100644 package/lzlib/lzlib.hash delete mode 100644 package/lzlib/lzlib.mk delete mode 100644 support/testing/tests/package/test_lzlib.py
Config.in.legacy +7 -0
@@ -236,6 +236,13 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH of the official Kodi github repo and its build is broken with Kodi 19.x, so it was removed. +config BR2_PACKAGE_LZLIB + bool "lzlib package was removed" + select BR2_PACKAGE_LUA_ZLIB + select BR2_LEGACY + help + The lzlib package was removed, use lua-zlib instead. + comment "Legacy options removed in 2021.02" config BR2_PACKAGE_MPD_AUDIOFILE
package/Config.in +0 -1
@@ -708,7 +708,6 @@ menu "Lua libraries/modules" source "package/lutok/Config.in" source "package/luv/Config.in" source "package/luvi/Config.in" - source "package/lzlib/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in" source "package/turbolua/Config.in"
package/lzlib/Config.in deleted +0 -10
@@ -1,10 +0,0 @@ -config BR2_PACKAGE_LZLIB - bool "lzlib" - depends on BR2_PACKAGE_LUA - select BR2_PACKAGE_ZLIB - help - This package provides a library to access zlib library - functions and also to read/write gzip files using an - interface similar to the base io package. - - https://github.com/LuaDist/lzlib
package/lzlib/lzlib.hash deleted +0 -3
@@ -1,3 +0,0 @@ -# Locally calculated -sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz -sha256 f817d4a37077e94e9adf379f46ba5cc0b68775d7add2bbd5b2ca68ba140ad5bb lzlib.c
package/lzlib/lzlib.mk deleted +0 -15
@@ -1,15 +0,0 @@ -################################################################################ -# -# lzlib -# -################################################################################ - -LZLIB_VERSION = 0.4.3 -LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) -LZLIB_DEPENDENCIES = lua zlib -LZLIB_LICENSE = MIT -LZLIB_LICENSE_FILES = lzlib.c -LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ - -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(cmake-package))
support/testing/tests/package/test_lzlib.py deleted +0 -14
@@ -1,14 +0,0 @@ -from tests.package.test_lua import TestLuaBase - - -class TestLuaLzlib(TestLuaBase): - config = TestLuaBase.config + \ - """ - BR2_PACKAGE_LUA=y - BR2_PACKAGE_LZLIB=y - """ - - def test_run(self): - self.login() - self.module_test("zlib") - self.module_test("gzip")
Signature · 1 line
2.30.2
PATCH 2/2 package/lzlib: remove it
Fran?ois, All,
On 2021-06-13 17:42 +0200, Francois Perrad spake thusly:
Quoted 1 line
Signed-off-by Francois Perrad <[email protected]>
Removing a package should dully explained in the commit log.
lua-zlib that you taunt as a replcement, adertises that it is not 100% percent compatible:
https://github.com/brimworks/lua-zlib/blob/master/README#L172
NOTE: This library ships with an "lzlib" compatibility shim. However, the following things are not compatible:
* zlib.version() in lzlib returns a string, but this library returns a numeric tuple (see above).
* zlib.{adler,crc}32() in lzlib returns the {adler,crc}32 initial value, however if this value is used with calls to adler32 it works in compatibility mode.
Furthermore, this limited comp[atibility can only be achieved if a package requests it:
To use this shim add the -DLZLIB_COMPAT compiler flag.
So, lua-zlib is not a drop-in replacement for lzlib.
As such, we can't remove lzlib (yet).
Regards,
Yann E. MORIN.
Quoted 116 lines
--- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/lzlib/Config.in | 10 ---------- package/lzlib/lzlib.hash | 3 --- package/lzlib/lzlib.mk | 15 --------------- support/testing/tests/package/test_lzlib.py | 14 -------------- 6 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 package/lzlib/Config.in delete mode 100644 package/lzlib/lzlib.hash delete mode 100644 package/lzlib/lzlib.mk delete mode 100644 support/testing/tests/package/test_lzlib.pyConfig.in.legacy +7
-0@@ -236,6 +236,13 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH of the official Kodi github repo and its build is broken with Kodi 19.x, so it was removed. +config BR2_PACKAGE_LZLIB + bool "lzlib package was removed" + select BR2_PACKAGE_LUA_ZLIB + select BR2_LEGACY + help + The lzlib package was removed, use lua-zlib instead. + comment "Legacy options removed in 2021.02" config BR2_PACKAGE_MPD_AUDIOFILEpackage/Config.in +0
-1@@ -708,7 +708,6 @@ menu "Lua libraries/modules" source "package/lutok/Config.in" source "package/luv/Config.in" source "package/luvi/Config.in" - source "package/lzlib/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in" source "package/turbolua/Config.in"package/lzlib/Config.in deleted +0
-10@@ -1,10 +0,0 @@ -config BR2_PACKAGE_LZLIB - bool "lzlib" - depends on BR2_PACKAGE_LUA - select BR2_PACKAGE_ZLIB - help - This package provides a library to access zlib library - functions and also to read/write gzip files using an - interface similar to the base io package. - - https://github.com/LuaDist/lzlibpackage/lzlib/lzlib.hash deleted +0
-3@@ -1,3 +0,0 @@ -# Locally calculated -sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz -sha256 f817d4a37077e94e9adf379f46ba5cc0b68775d7add2bbd5b2ca68ba140ad5bb lzlib.cpackage/lzlib/lzlib.mk deleted +0
-15@@ -1,15 +0,0 @@ -################################################################################ -# -# lzlib -# -################################################################################ - -LZLIB_VERSION = 0.4.3 -LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) -LZLIB_DEPENDENCIES = lua zlib -LZLIB_LICENSE = MIT -LZLIB_LICENSE_FILES = lzlib.c -LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ - -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(cmake-package))support/testing/tests/package/test_lzlib.py deleted +0
-14@@ -1,14 +0,0 @@ -from tests.package.test_lua import TestLuaBase - - -class TestLuaLzlib(TestLuaBase): - config = TestLuaBase.config + \ - """ - BR2_PACKAGE_LUA=y - BR2_PACKAGE_LZLIB=y - """ - - def test_run(self): - self.login() - self.module_test("zlib") - self.module_test("gzip")Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/lzlib: remove it
Le lun. 14 juin 2021 ? 22:27, Yann E. MORIN <[email protected]> a ?crit :
Quoted 18 lines
Fran?ois, All,
On 2021-06-13 17:42 +0200, Francois Perrad spake thusly:
Quoted 1 line
Signed-off-by Francois Perrad <[email protected]>Removing a package should dully explained in the commit log.
lua-zlib that you taunt as a replcement, adertises that it is not 100% percent compatible:
https://github.com/brimworks/lua-zlib/blob/master/README#L172
NOTE: This library ships with an "lzlib" compatibility shim. However, the following things are not compatible:
*
zlib.version()in lzlib returns a string, but this library returns a numeric tuple (see above).
Quoted 10 lines
* zlib.{adler,crc}32() in lzlib returns the {adler,crc}32 initial value, however if this value is used with calls to adler32 it works in compatibility mode.
Furthermore, this limited comp[atibility can only be achieved if a package requests it:
To use this shim add the -DLZLIB_COMPAT compiler flag.
This is done by the rockspec:
see
https://github.com/brimworks/lua-zlib/blob/master/rockspecs/lua-zlib-1.2-0.rockspec#L33
Fran?ois
Quoted 143 lines
So, lua-zlib is not a drop-in replacement for lzlib.
As such, we can't remove lzlib (yet).
Regards,
Yann E. MORIN.Quoted 65 lines
--- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/lzlib/Config.in | 10 ---------- package/lzlib/lzlib.hash | 3 --- package/lzlib/lzlib.mk | 15 --------------- support/testing/tests/package/test_lzlib.py | 14 -------------- 6 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 package/lzlib/Config.in delete mode 100644 package/lzlib/lzlib.hash delete mode 100644 package/lzlib/lzlib.mk delete mode 100644 support/testing/tests/package/test_lzlib.pyConfig.in.legacy +7
-0@@ -236,6 +236,13 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH of the official Kodi github repo and its build is broken with Kodi 19.x, so it was removed. +config BR2_PACKAGE_LZLIB + bool "lzlib package was removed" + select BR2_PACKAGE_LUA_ZLIB + select BR2_LEGACY + help + The lzlib package was removed, use lua-zlib instead. + comment "Legacy options removed in 2021.02" config BR2_PACKAGE_MPD_AUDIOFILEpackage/Config.in +0
-1@@ -708,7 +708,6 @@ menu "Lua libraries/modules" source "package/lutok/Config.in" source "package/luv/Config.in" source "package/luvi/Config.in" - source "package/lzlib/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in" source "package/turbolua/Config.in"package/lzlib/Config.in deleted +0
-10@@ -1,10 +0,0 @@ -config BR2_PACKAGE_LZLIB - bool "lzlib" - depends on BR2_PACKAGE_LUA - select BR2_PACKAGE_ZLIB - help - This package provides a library to access zlib library - functions and also to read/write gzip files using an - interface similar to the base io package. - - https://github.com/LuaDist/lzlibpackage/lzlib/lzlib.hash deleted +0
-0package/lzlib/lzlib.hash line 2
Quoted 2 lines
package/lzlib/lzlib.hash deleted +0
-2@@ -1,3 +0,0 @@ -# Locally calculated -sha256
cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbblzlib-0.4.3.tar.gzpackage/lzlib/lzlib.hash line 3
Quoted 1 line
package/lzlib/lzlib.hash deleted +0
-1-sha256
f817d4a37077e94e9adf379f46ba5cc0b68775d7add2bbd5b2ca68ba140ad5bblzlib.cpackage/lzlib/lzlib.mk
Quoted 7 lines
package/lzlib/lzlib.mk deleted +0
-0@@ -1,15 +0,0 @@-################################################################################
package/lzlib/lzlib.mk line 4
Quoted 4 lines
package/lzlib/lzlib.mk deleted +0
-3-# -# lzlib -#-################################################################################
package/lzlib/lzlib.mk
Quoted 7 lines
package/lzlib/lzlib.mk deleted +0
-7- -LZLIB_VERSION = 0.4.3 -LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) -LZLIB_DEPENDENCIES = lua zlib -LZLIB_LICENSE = MIT -LZLIB_LICENSE_FILES = lzlib.c -LZLIB_CONF_OPTS =-DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
Review
Quoted 4 lines
package/lzlib/lzlib.mk deleted +0
-3- -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(cmake-package))(quoted diff) +0
-0
b/support/testing/tests/package/test_lzlib.pyQuoted 22 lines
deleted file mode 100644
index 84e767913..000000000support/testing/tests/package/test_lzlib.py deleted +0
-15@@ -1,14 +0,0 @@ -from tests.package.test_lua import TestLuaBase - - -class TestLuaLzlib(TestLuaBase): - config = TestLuaBase.config + \ - """ - BR2_PACKAGE_LUA=y - BR2_PACKAGE_LZLIB=y - """ - - def test_run(self): - self.login() - self.module_test("zlib") - self.module_test("gzip") --2.30.2
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
Quoted 6 lines
'------------------------------^-------^------------------^--------------------'
_______________________________________________
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/20210615/32707a4f/attachment.html>
PATCH 2/2 package/lzlib: remove it
Fran?ois, All,
On 2021-06-15 13:30 +0200, Fran?ois Perrad spake thusly:
Quoted 6 lines
Le?lun. 14 juin 2021 ??22:27, Yann E. MORIN < [1][email protected]> a ?crit?:
On 2021-06-13 17:42 +0200, Francois Perrad spake thusly:Quoted 1 line
Signed-off-by Francois Perrad < [2][email protected]>Removing a package should dully explained in the commit log. lua-zlib that you taunt as a replcement, adertises that it is not 100% percent compatible:
[--SNIP--]
Quoted 4 lines
? ? To use this shim add the -DLZLIB_COMPAT compiler flag.
This is done by the rockspec:
see [4]https://github.com/brimworks/lua-zlib/blob/master/rockspecs/lua-zlib-1.2-0.rockspec#L33
So, this is the kind of information that should be part of the commit log, for example (e.g.: the rockspec file for lua-zlib automatically enables this legacy shim, so packages autoamtically inherit it).
However, this is still not a drop-in replacement, because parts of the API return different types than lzlib did.
So, if some packages really need that part, they can't use lua-zlib.
Additionally, it is still OK to keep an old package in the tree, at least as long as there is no drop-in-replacement, or that there are still in-tree users, and as long as it does not cause any build failure, that is not much an issue...
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Yann E. MORIN
AppliedPATCH 1/2 package/lua-zlib: new package
In reply to Francois PerradFran?ois, All,
On 2021-06-13 17:42 +0200, Francois Perrad spake thusly:
Quoted 1 line
this module is compatible with lzlib (which is no longer maintained).
I've slightly amended this commit log to note that the compatibility is only partial.
Quoted 1 line
Signed-off-by Francois Perrad <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 104 lines
--- package/Config.in | 1 + package/lua-zlib/Config.in | 10 ++++++++ package/lua-zlib/lua-zlib.hash | 2 ++ package/lua-zlib/lua-zlib.mk | 12 +++++++++ .../testing/tests/package/test_lua_zlib.py | 25 +++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/lua-zlib/Config.in create mode 100644 package/lua-zlib/lua-zlib.hash create mode 100644 package/lua-zlib/lua-zlib.mk create mode 100644 support/testing/tests/package/test_lua_zlib.pypackage/Config.in +1
-0@@ -689,6 +689,7 @@ menu "Lua libraries/modules" source "package/lua-testmore/Config.in" source "package/lua-utf8/Config.in" source "package/lua-valua/Config.in" + source "package/lua-zlib/Config.in" source "package/luabitop/Config.in" source "package/luadbi/Config.in" source "package/luadbi-sqlite3/Config.in"package/lua-zlib/Config.in new file +10
-0@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LUA_ZLIB + bool "lua-zlib" + select BR2_PACKAGE_ZLIB + help + Simple streaming interface to zlib for Lua. + Consists of two functions: inflate and deflate. + Both functions return "stream functions" (takes a buffer + of input and returns a buffer of output). + + https://github.com/brimworks/lua-zlibpackage/lua-zlib/lua-zlib.hash new file +2
-0@@ -0,0 +1,2 @@ +# computed by luarocks/buildroot +sha256 42436ba2b78c9a2d515d6da59ceb12cdea7f84c9ce3c859d91addb42badd4061 lua-zlib-1.2-0.src.rockpackage/lua-zlib/lua-zlib.mk new file +12
-0@@ -0,0 +1,12 @@ +################################################################################ +# +# lua-zlib +# +################################################################################ + +LUA_ZLIB_VERSION = 1.2-0 +LUA_ZLIB_SUBDIR = lua-zlib +LUA_ZLIB_LICENSE = MIT +LUA_ZLIB_DEPENDENCIES = zlib + +$(eval $(luarocks-package))support/testing/tests/package/test_lua_zlib.py new file +25
-0@@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuazlib(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_ZLIB=y + """ + + def test_run(self): + self.login() + self.module_test("zlib") + + +class TestLuajitLuazlib(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUA_ZLIB=y + """ + + def test_run(self): + self.login() + self.module_test("zlib")Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'