package/luainterpreter: rename the _HAS and _PROVIDES variables

The basic rule for a package is to have its options named
after the package name. There is no reason this should not
also be the case for virtual packages.

Besides, this will allow us to switch luainterpreter to use the
soon-to-be-introduced virtual-package infrastructure.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Cc: Mike Zick <minimod@morethan.org>
Cc: Francois Perrad <fperrad@gmail.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index 945c7cadf207dfb94947bb9b1aa82f4f8693f6e6..9d8b31f85552989ada9aa9d7d1c434faa06cc595 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -371,7 +371,7 @@ source "package/jimtcl/Config.in"
 source "package/lua/Config.in"
 source "package/luainterpreter/Config.in"
 source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUA_INTERPRETER && !BR2_PREFER_STATIC_LIB
+if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_PREFER_STATIC_LIB
 # lua modules are dynamically loaded, so not available on static builds
 menu "Lua libraries/modules"
 source "package/cgilua/Config.in"

diff --git a/package/lbase64/Config.in b/package/lbase64/Config.in
index 4593ab9693945e59fcf01a6966979e225b533121..48d3fdb3521107c440ef06c67d945885ac945eef 100644 (file)
--- a/package/lbase64/Config.in
+++ b/package/lbase64/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LBASE64
        bool "lbase64"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        depends on !BR2_PACKAGE_LUA_5_2
        help
          A base64 library for Lua

diff --git a/package/lpeg/Config.in b/package/lpeg/Config.in
index da54d61ab5fd99480ed36404d6261e9428ffb1eb..957991d4166e33c71dbb58077d50b6b2a6c442a5 100644 (file)
--- a/package/lpeg/Config.in
+++ b/package/lpeg/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LPEG
        bool "lpeg"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          LPeg is a new pattern-matching library for Lua,
          based on Parsing Expression Grammars (PEGs).

diff --git a/package/lpty/Config.in b/package/lpty/Config.in
index 5e7ad148a99ca732915ca0f275d59470f819806d..50cbd2548a29bec335f4a4850b0b8c6298c48ffc 100644 (file)
--- a/package/lpty/Config.in
+++ b/package/lpty/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LPTY
        bool "lpty"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          A simple facility for lua to control other programs via
          PTYs.

diff --git a/package/lrandom/Config.in b/package/lrandom/Config.in
index 661707d7fb5050b133b35e60f03ef5a0cc4affa7..64bcf0ce0114d4fbfcb15170437460d2bb1a9576 100644 (file)
--- a/package/lrandom/Config.in
+++ b/package/lrandom/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LRANDOM
        bool "lrandom"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          A library for generating random numbers
          based on the Mersenne Twister

diff --git a/package/lsqlite3/Config.in b/package/lsqlite3/Config.in
index e19c7890d52653b74bfded49b9e1713f2f818b58..cc431ae08dcab211be01241e3f6aaaec8002088b 100644 (file)
--- a/package/lsqlite3/Config.in
+++ b/package/lsqlite3/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LSQLITE3
        bool "lsqlite3"
        select BR2_PACKAGE_SQLITE
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          a thin Lua wrapper for the SQLite3 library.
 

diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in
index 8129fab4c3b3e7af1295f99baeda3d2831dcdb81..1f4c7c79828b510819f9ccf9d18465f21c97b069 100644 (file)
--- a/package/lua-cjson/Config.in
+++ b/package/lua-cjson/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_CJSON
        bool "lua-cjson"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          The Lua CJSON module provides JSON support for Lua. It features:
          - Fast, standards compliant encoding/parsing routines

diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in
index 28da114a40b397be4c6ab6500f3b32cbb168737a..74b5dc7b8ed9274574bd043c1b31d105ba20beb5 100644 (file)
--- a/package/lua-ev/Config.in
+++ b/package/lua-ev/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_EV
        bool "lua-ev"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        select BR2_PACKAGE_LIBEV
        depends on !(BR2_avr32 || BR2_bfin) # libev
        help

diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in
index 498b30cb2b3d00e8a58f47f31b21da93586fc10e..c7b33731d012fba5e003e603beb446881789fd16 100644 (file)
--- a/package/lua-msgpack-native/Config.in
+++ b/package/lua-msgpack-native/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_MSGPACK_NATIVE
        bool "lua-msgpack-native"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        depends on !BR2_PACKAGE_LUA_5_2
        help
          This is a native, C language implementation of msgpack

diff --git a/package/lua/Config.in b/package/lua/Config.in
index c4c12e96634b790859c0ebcb46fd2972e46b004a..2f1b25befd1a59960e60e82644115eb3d6ac729c 100644 (file)
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA
        bool "lua"
-       select BR2_PACKAGE_HAS_LUA_INTERPRETER
+       select BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          Lua is a powerful, fast, light-weight, embeddable scripting language.
 
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LUA
 
 if BR2_PACKAGE_LUA
 
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
        default "lua"
 
 choice

diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in
index f8db318e828832974e36218d480f6947a38616ec..6976e40c67e20e186a27f548a6766b8a22159547 100644 (file)
--- a/package/luaexpat/Config.in
+++ b/package/luaexpat/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LUAEXPAT
        bool "luaexpat"
        select BR2_PACKAGE_EXPAT
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          LuaExpat is a SAX XML parser based on the Expat library.
 

diff --git a/package/luafilesystem/Config.in b/package/luafilesystem/Config.in
index 489ebf359a152c6275e44ed1949355b692de06ca..50e7975b9201a5c69d8ada3735ee4c8ee833cde7 100644 (file)
--- a/package/luafilesystem/Config.in
+++ b/package/luafilesystem/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUAFILESYSTEM
        bool "luafilesystem"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          LuaFileSystem offers a portable way to access
          the underlying directory structure and file attributes.

diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in
index a05bde1db3b47aa2532066423a65d0e2d3b88060..e89a9b84d2d44465fc529c522f5f712052829e6d 100644 (file)
--- a/package/luainterpreter/Config.in
+++ b/package/luainterpreter/Config.in
@@ -1,9 +1,9 @@
-config BR2_PACKAGE_HAS_LUA_INTERPRETER
+config BR2_PACKAGE_HAS_LUAINTERPRETER
        bool
 
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
        string
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
        string

diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk
index f9206e82fd8ae2bbb963fe11895b6896e3ac4b11..40d42900a0b6a5a17f15e5a86146c884537606d8 100644 (file)
--- a/package/luainterpreter/luainterpreter.mk
+++ b/package/luainterpreter/luainterpreter.mk
@@ -5,11 +5,11 @@
 ################################################################################
 
 LUAINTERPRETER_SOURCE =
-LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER))
+LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))
 
 LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION))
 
-ifeq ($(BR2_PACKAGE_HAS_LUA_INTERPRETER),y)
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
 ifeq ($(LUAINTERPRETER_DEPENDENCIES),)
 $(error No lua interpreter implementation selected. Configuration error.)
 endif

diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index bce9cc43155beb64ec816b3435e857b1361210ee..58b165381fca4697ecd4402df9dc6f1d366160c2 100644 (file)
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUAJIT
        bool "luajit"
-       select BR2_PACKAGE_HAS_LUA_INTERPRETER
+       select BR2_PACKAGE_HAS_LUAINTERPRETER
        # Luajit is only available for some target architectures, and
        # has some complexity wrt 32/64. See luajit.mk for details.
        depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel
@@ -14,7 +14,7 @@ config BR2_PACKAGE_LUAJIT
 
 if BR2_PACKAGE_LUAJIT
 
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
        default "luajit"
 
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION

diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index a95c8259ff9dc43c2df5ea720432954d2a225b98..04269fbf469f620ac14c83b8d900b4b74f20834d 100644 (file)
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUAPOSIX
        bool "luaposix"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
        # LuaBitOp is already included in LuaJIT
        help

diff --git a/package/luasec/Config.in b/package/luasec/Config.in
index ed55df73ae866e8ee11881276bcf38f8d82b3179..a8cc9c977e869d1da808c9abe87eb8dd13ff4b5e 100644 (file)
--- a/package/luasec/Config.in
+++ b/package/luasec/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LUASEC
        bool "luasec"
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_LUASOCKET
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          LuaSec is a binding for OpenSSL library to provide TLS/SSL
          communication.

diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in
index 619d649677917ddcb1967a0f793bc80221c48d00..45f959e8d09d2ad3fdb6f84bc2afa62f82e183a5 100644 (file)
--- a/package/luasocket/Config.in
+++ b/package/luasocket/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUASOCKET
        bool "luasocket"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          LuaSocket is the most comprehensive networking support library
          for the Lua language.

diff --git a/package/luasql-sqlite3/Config.in b/package/luasql-sqlite3/Config.in
index fca6582bdfb40813711e4654485b66a92d12eb2c..3bd73f3ba559d6aa2f8cbfcd5f8448afb24d5c76 100644 (file)
--- a/package/luasql-sqlite3/Config.in
+++ b/package/luasql-sqlite3/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUASQL_SQLITE3
        bool "luasql-sqlite3"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        select BR2_PACKAGE_SQLITE
        help
          LuaSQL is a simple interface from Lua to a DBMS.

diff --git a/package/lzlib/Config.in b/package/lzlib/Config.in
index d2b4818675912b6b7cd651e941f5343c466da2da..c123019170cf508991a2bdac04f875fe422aca08 100644 (file)
--- a/package/lzlib/Config.in
+++ b/package/lzlib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LZLIB
        bool "lzlib"
        select BR2_PACKAGE_ZLIB
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          This package provides a library to access zlib library
          functions and also to read/write gzip files using an

diff --git a/package/rings/Config.in b/package/rings/Config.in
index b1d41f391a3874e8de32f9f51bdbfb8c579b7406..87ade07cb1295233ba30d32b158f1b48a33adcfb 100644 (file)
--- a/package/rings/Config.in
+++ b/package/rings/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_RINGS
        bool "rings"
-       depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+       depends on BR2_PACKAGE_HAS_LUAINTERPRETER
        help
          Provides a way to create new Lua states from within Lua.