Skip to contentSkip to conversation

luarocks: bump to version 3.0.1

PATCH New Francois Perrad 2 participants 2 messages Aug 16, 2018

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH v2 1/1 luarocks: bump to version 3.0.1

The meaning of --sysconfdir has changed (see announcement http://lua-users.org/lists/lua-l/2018-08/msg00101.html),
So, LUAROCKS_CONFIG_DIR & LUAROCKS_CONFIG_FILE are adjusted.

Signed-off-by Francois Perrad <[email protected]>
---
 package/luarocks/0001-allow-libluajit-detection.patch | 4 +++-
 package/luarocks/luarocks.hash                        | 2 +-
 package/luarocks/luarocks.mk                          | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)
package/luarocks/0001-allow-libluajit-detection.patch +3 -1
index c5e52f428..05d025bba 100644
@@ -6,6 +6,8 @@ Subject: [PATCH] allow libluajit detection
 This detection was done only if luarocks is runned by luajit.
 But on Buildroot, luarocks is always runned by lua.
 
+See https://github.com/luarocks/luarocks/pull/883
+
 Signed-off-by: Francois Perrad <[email protected]>
 ---
  src/luarocks/deps.lua | 4 +---

@@ -15,7 +17,7 @@ diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
 index 8403f12..c1c0220 100644
 --- a/src/luarocks/deps.lua
 +++ b/src/luarocks/deps.lua
-@@ -511,10 +511,8 @@ function deps.check_lua(vars)
+@@ -513,10 +513,8 @@ function deps.check_lua(vars)
        "lua-" .. cfg.lua_version,
        "lua-" .. shortv,
        "lua",
package/luarocks/luarocks.hash +1 -1
index 87ef6827c..4aa791cb4 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 a43fffb997100f11cccb529a3db5456ce8dab18171a5cb3645f948147b6f64a1  luarocks-3.0.0.tar.gz
+sha256 b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0  luarocks-3.0.1.tar.gz
package/luarocks/luarocks.mk +3 -3
index cd4be266c..25e3ad3e2 100644
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-LUAROCKS_VERSION = 3.0.0
+LUAROCKS_VERSION = 3.0.1
 LUAROCKS_SITE = http://luarocks.org/releases
 LUAROCKS_LICENSE = MIT
 LUAROCKS_LICENSE_FILES = COPYING
 
 HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
 
-LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc/luarocks
-LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc
+LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua
 LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH v2 1/1 luarocks: bump to version 3.0.1

Hello,

Quoted 9 lines · Francois Perrad

The meaning of --sysconfdir has changed (see announcement http://lua-users.org/lists/lua-l/2018-08/msg00101.html),
So, LUAROCKS_CONFIG_DIR & LUAROCKS_CONFIG_FILE are adjusted.

Signed-off-by Francois Perrad <[email protected]>
---
 package/luarocks/0001-allow-libluajit-detection.patch | 4 +++-
 package/luarocks/luarocks.hash                        | 2 +-
 package/luarocks/luarocks.mk                          | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

Applied to next, thanks.

Thomas

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