From patchwork Fri Nov 15 13:07:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 291564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C0D0A2C00BA for ; Sat, 16 Nov 2013 00:09:12 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 000848F7D3; Fri, 15 Nov 2013 13:09:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LWPZ0qkMOg3Q; Fri, 15 Nov 2013 13:09:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E75958F7AC; Fri, 15 Nov 2013 13:08:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 16C4D1C107A for ; Fri, 15 Nov 2013 13:08:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C2838F76B for ; Fri, 15 Nov 2013 13:08:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QUTLTFj2xPM3 for ; Fri, 15 Nov 2013 13:08:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by whitealder.osuosl.org (Postfix) with ESMTPS id 618A98F780 for ; Fri, 15 Nov 2013 13:08:39 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id q59so1411469wes.41 for ; Fri, 15 Nov 2013 05:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vh/Tfdc17mz6dMbtWKl0xNCZK8RV/ryYZqndgsAVNTk=; b=I700Qjd29DmgdlddumIRwLRN8FDQlnB3pfJoSSUnLTrvrLPX+gcbEIL3ylw9AYgtXB LBxUEAcpxA+Pv7v2uJdKEmUqAGuO54bQTvqVMBfGgDtfS/EmYqe/Wyos/L6AkbAmQ2IH RD6dWRzk2ogzPafPZ7ACFjWuIzL6x6gi0Z2bshXd/EIG1gzkfPe3OMebIN2fDbaWomQV JarQjF9eqpNvtpj1N7MjWtm0DQzHZnmzMm0nhqL/aftdf3NjpqjcQ46TutHgrcjzxnyM UPR7QDMLoNEP1oMsV+qmM4fK0ExY4ACpaiRK7D3HaQhqo93+nKihdtfOTJic8DOYQ9lw ErYA== X-Received: by 10.194.23.8 with SMTP id i8mr99578wjf.68.1384520917998; Fri, 15 Nov 2013 05:08:37 -0800 (PST) Received: from localhost.localdomain (149.117.82.79.rev.sfr.net. [79.82.117.149]) by mx.google.com with ESMTPSA id y20sm4929268wib.0.2013.11.15.05.08.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Nov 2013 05:08:37 -0800 (PST) From: Francois Perrad To: buildroot@busybox.net Date: Fri, 15 Nov 2013 14:07:36 +0100 Message-Id: <1384520859-3189-7-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384520859-3189-1-git-send-email-francois.perrad@gadz.org> References: <1384520859-3189-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [pkg-luarocks infra V4 07/10] lua-cjson: restore official name 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 (need by LuaRocks) Signed-off-by: Francois Perrad Reviewed-by: Thomas Petazzoni --- Config.in.legacy | 10 ++++++++++ package/Config.in | 2 +- package/{luacjson => lua-cjson}/Config.in | 4 ++-- .../luacjson.mk => lua-cjson/lua-cjson.mk} | 21 ++++++++++---------- 4 files changed, 23 insertions(+), 14 deletions(-) rename package/{luacjson => lua-cjson}/Config.in (90%) rename package/{luacjson/luacjson.mk => lua-cjson/lua-cjson.mk} (56%) diff --git a/Config.in.legacy b/Config.in.legacy index 587afe1..a7fa821 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -99,6 +99,16 @@ comment "----------------------------------------------------" endif ############################################################################### +comment "Legacy options removed in 2014.02" + +config BR2_PACKAGE_LUACJSON + bool "luacjson has been replaced by lua-cjson" + select BR2_PACKAGE_LUA_CJSON + select BR2_LEGACY + help + The option has been renamed BR2_PACKAGE_LUA_CJSON. + +############################################################################### comment "Legacy options removed in 2013.11" config BR2_PACKAGE_QT_JAVASCRIPTCORE diff --git a/package/Config.in b/package/Config.in index a8ebb27..ea8d524 100644 --- a/package/Config.in +++ b/package/Config.in @@ -361,7 +361,6 @@ source "package/copas/Config.in" source "package/coxpcall/Config.in" source "package/lbase64/Config.in" source "package/luabitop/Config.in" -source "package/luacjson/Config.in" source "package/luacrypto/Config.in" source "package/luaexpat/Config.in" source "package/luaexpatutils/Config.in" @@ -370,6 +369,7 @@ source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in" source "package/luasql/Config.in" +source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" source "package/lua-msgpack-native/Config.in" source "package/orbit/Config.in" diff --git a/package/luacjson/Config.in b/package/lua-cjson/Config.in similarity index 90% rename from package/luacjson/Config.in rename to package/lua-cjson/Config.in index d3665c0..8129fab 100644 --- a/package/luacjson/Config.in +++ b/package/lua-cjson/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_LUACJSON - bool "luacjson" +config BR2_PACKAGE_LUA_CJSON + bool "lua-cjson" depends on BR2_PACKAGE_HAS_LUA_INTERPRETER help The Lua CJSON module provides JSON support for Lua. It features: diff --git a/package/luacjson/luacjson.mk b/package/lua-cjson/lua-cjson.mk similarity index 56% rename from package/luacjson/luacjson.mk rename to package/lua-cjson/lua-cjson.mk index f973278..0969547 100644 --- a/package/luacjson/luacjson.mk +++ b/package/lua-cjson/lua-cjson.mk @@ -1,17 +1,16 @@ ################################################################################ # -# luacjson +# lua-cjson # ################################################################################ -LUACJSON_VERSION = 2.1.0 -LUACJSON_SOURCE = lua-cjson-$(LUACJSON_VERSION).tar.gz -LUACJSON_SITE = http://www.kyne.com.au/~mark/software/download -LUACJSON_DEPENDENCIES = luainterpreter -LUACJSON_LICENSE = MIT -LUACJSON_LICENSE_FILES = LICENSE +LUA_CJSON_VERSION = 2.1.0 +LUA_CJSON_SITE = http://www.kyne.com.au/~mark/software/download +LUA_CJSON_DEPENDENCIES = luainterpreter +LUA_CJSON_LICENSE = MIT +LUA_CJSON_LICENSE_FILES = LICENSE -define LUACJSON_BUILD_CMDS +define LUA_CJSON_BUILD_CMDS $(MAKE) -C $(@D) \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ @@ -20,15 +19,15 @@ define LUACJSON_BUILD_CMDS PREFIX=$(STAGING_DIR)/usr endef -define LUACJSON_INSTALL_TARGET_CMDS +define LUA_CJSON_INSTALL_TARGET_CMDS $(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install endef -define LUACJSON_CLEAN_CMDS +define LUA_CJSON_CLEAN_CMDS $(MAKE) -C $(@D) clean endef -define LUACJSON_UNINSTALL_TARGET_CMDS +define LUA_CJSON_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/lib/lua/5.1/cjson.so endef