From patchwork Sun Mar 2 16:52:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 325605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CB4812C00C5 for ; Mon, 3 Mar 2014 03:53:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 21DD310626; Sun, 2 Mar 2014 16:53:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JV6LMIE3spqW; Sun, 2 Mar 2014 16:53:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 50A0010676; Sun, 2 Mar 2014 16:53:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BAB171BF836 for ; Sun, 2 Mar 2014 16:53:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B724410665 for ; Sun, 2 Mar 2014 16:53:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4H6CvQdIO8Wi for ; Sun, 2 Mar 2014 16:53:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C3EB8E495 for ; Sun, 2 Mar 2014 16:53:12 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id r20so2298546wiv.10 for ; Sun, 02 Mar 2014 08:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+qhpvlXFuQWTn9cvcq5VtiDYx88DSKBqV7re0qGzvws=; b=X5aZfab/aqPgd7DZtm7QHuFyv1+LW6AbYgieHAC5W5OCf+USeuBfEh34o7tl23ZFdL QX1EYOt89jQ/GAXBWnyCqpjzAJnKZ3ui6Cah9q1+047kA6iHnTTMbnEkkZlAN7qYZ27R mW3KoB2dYh4FJ3M/Vay3sq7N+qG2pIzmsD0jqbTgbBR0Z4RHlOSTk+nkJkwtftOfAq4x bcI0Es3xf1kdrNnTS6dtDj+LgYbpLadeuKR9B8yjdwBeuXMrg3y29XbpjjEtJznuvGam OnyFHqNQxWjFVeasCQDakywVlaDWR7fFBhlNm/kgmFL8ZOJEntdniNzkwOAVOg+Mg2Ld Dvsg== X-Received: by 10.180.12.14 with SMTP id u14mr11711013wib.0.1393779191116; Sun, 02 Mar 2014 08:53:11 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id h13sm21964648wjr.22.2014.03.02.08.53.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 02 Mar 2014 08:53:10 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 2 Mar 2014 17:52:47 +0100 Message-Id: <94325713b9304e6c90b940a614c9d99579679f77.1393778339.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 06/19] package/lua: rename config options X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" 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'. Signed-off-by: "Yann E. MORIN" Cc: Francois Perrad Reviewed-by: Samuel Martin --- Config.in.legacy | 21 +++++++++++++++++++++ package/lua/Config.in | 10 +++++----- package/lua/lua.mk | 4 ++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index afcd3b1..e536ae0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,27 @@ endif ############################################################################### comment "Legacy options removed in 2014.05" +config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE + bool "Lua command-line editing none has been renamed" + 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" + 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" + 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_KERNEL_HEADERS_SNAP bool "Local Linux snapshot support removed" select BR2_LEGACY diff --git a/package/lua/Config.in b/package/lua/Config.in index 2f1b25b..0e31858 100644 --- 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 bf68e65..bc8799a 100644 --- 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