package/lua: rename config options

Package's options should be named after the package.

Lua is an interpreter, but the package is named 'lua'. So we want to
name the config option with '_LUA_', not with '_LUA_INTERPRETER_'

Besides, naming them with '_LUA_INTERPRETER_' might be confusing, since
there is a package named 'luainterpreter'.

Since the renamed options are part of a choice, we can't use the legacy
options to select the new ones. So we instead instruct the user to go
select the appropriate option in the choice.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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/Config.in.legacy b/Config.in.legacy
index 17ead9b9de917129542fc2c40cfe6e7a3efdc942..ce44d0f5cca45c8676f39fab77288de3008b804a 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2014.05"
 
+config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+       bool "Lua command-line editing none has been renamed"
+       select BR2_LEGACY
+       help
+         The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been
+         renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select
+         it in the corresponding choice.
+
+config BR2_PACKAGE_LUA_INTERPRETER_READLINE
+       bool "Lua command-line editing using readline has been renamed"
+       select BR2_LEGACY
+       help
+         The BR2_PACKAGE_LUA_INTERPRETER_READLINE option has been
+         renamed to BR2_PACKAGE_LUA_READLINE. You will have to select
+         it in the corresponding choice.
+
+config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+       bool "Lua command-line editing using linenoise has been renamed"
+       select BR2_LEGACY
+       help
+         The BR2_PACKAGE_LUA_INTERPRETER_LINENOISE option has been
+         renamed to BR2_PACKAGE_LUA_LINENOISE. You will have to select
+         it in the corresponding choice.
+
 config BR2_PACKAGE_DVB_APPS_UTILS
        bool "dvb-apps utilities now built by default"
        select BR2_LEGACY

diff --git a/package/lua/Config.in b/package/lua/Config.in
index 2f1b25befd1a59960e60e82644115eb3d6ac729c..0e318585cd8134aa63a755aea3eb51e685270aca 100644 (file)
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -30,22 +30,22 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
        default "5.2"   if BR2_PACKAGE_LUA_5_2
 
 choice
-       prompt "Lua Interpreter command-line editing"
-       default BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+       prompt "Lua command-line editing"
+       default BR2_PACKAGE_LUA_EDITING_NONE
 
-config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+config BR2_PACKAGE_LUA_EDITING_NONE
        bool "none"
        help
          None.
 
-config BR2_PACKAGE_LUA_INTERPRETER_READLINE
+config BR2_PACKAGE_LUA_READLINE
        bool "readline support"
        select BR2_PACKAGE_READLINE
        select BR2_PACKAGE_NCURSES
        help
          Enables command-line editing in the Lua interpreter.
 
-config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+config BR2_PACKAGE_LUA_LINENOISE
        bool "linenoise support"
        select BR2_PACKAGE_LINENOISE
        help

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index bf68e654f28887e85f7293ed00e006973b2bf702..bc8799a087e288d353dffa9ce31976e193b39b12 100644 (file)
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -31,12 +31,12 @@ else
        LUA_MYLIBS += -ldl
 endif
 
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
+ifeq ($(BR2_PACKAGE_LUA_READLINE),y)
        LUA_DEPENDENCIES = readline ncurses
        LUA_MYLIBS += -lreadline -lhistory -lncurses
        LUA_CFLAGS += -DLUA_USE_READLINE
 else
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
+ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y)
        LUA_DEPENDENCIES = linenoise
        LUA_MYLIBS += -llinenoise
        LUA_CFLAGS += -DLUA_USE_LINENOISE