From patchwork Sat Jan 11 15:42:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 309513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id EB92A2C0097 for ; Sun, 12 Jan 2014 02:42:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5D7BC93C16; Sat, 11 Jan 2014 15:42:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sa8eSNr6MGAO; Sat, 11 Jan 2014 15:42:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C1F0B93A7F; Sat, 11 Jan 2014 15:42:43 +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 1978A1BF97D for ; Sat, 11 Jan 2014 15:42:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 12B3B8CDE1 for ; Sat, 11 Jan 2014 15:42:39 +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 uHh9zzVdUc-U for ; Sat, 11 Jan 2014 15:42:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 313C48CD98 for ; Sat, 11 Jan 2014 15:42:37 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id l18so4162921wgh.11 for ; Sat, 11 Jan 2014 07:42:35 -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=xog2t7fLfTK7HjBeb8gDKdkvs8CHUOyvHW/XiqVaF5w=; b=qOMbdFRaiqYER7oKMAUTpt4jAbwjFzMxI4hX/NV6Hzt7p+bW9vWHyXKVBQ6dqR5pNp Zz6LgY26lsQ9S0JWtgFGIjqNqIIlL9N/wV1/3e4icQO+TkJicydTnqFw5bHFTSd5O8AM RL01Ok4Aef4a2teQ02vd371iw3TcJAXuCWgr67JvJdDB8A8ZkGx6FEARHApCWCZpClbR y6VigSp9sN5yMceEt1y8gQr5uDCpf1hL8qIn/PP+v+a1SKBbEanskSi9LVx3UtYtcYYm yxnXPJt+U3vHbEJUIpZcJAbYNH8OCQ4pdBkvT9vDwSb204DWvAY1C9ueUWdDs0N2bwKe ubwA== X-Received: by 10.194.81.196 with SMTP id c4mr13784145wjy.57.1389454955718; Sat, 11 Jan 2014 07:42:35 -0800 (PST) Received: from ubuntu.localdomain (94.166.87.79.rev.sfr.net. [79.87.166.94]) by mx.google.com with ESMTPSA id kr10sm6852597wjc.22.2014.01.11.07.42.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 Jan 2014 07:42:35 -0800 (PST) From: Francois Perrad To: buildroot@busybox.net Date: Sat, 11 Jan 2014 16:42:07 +0100 Message-Id: <1389454937-13494-6-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389454937-13494-1-git-send-email-francois.perrad@gadz.org> References: <1389454937-13494-1-git-send-email-francois.perrad@gadz.org> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [pkg-luarocks infra v7 05/15] luarocks: new infrastructure 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 Signed-off-by: Francois Perrad [yann.morin.1998@free.fr: apply Thomas' comments] Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni --- Config.in | 8 +++++ Makefile | 1 + package/Makefile.in | 1 + package/luarocks/luarocks.mk | 3 ++ package/pkg-luarocks.mk | 82 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 package/pkg-luarocks.mk diff --git a/Config.in b/Config.in index 667c084..93d8fce 100644 --- a/Config.in +++ b/Config.in @@ -217,6 +217,14 @@ config BR2_DEBIAN_MIRROR endif +config BR2_LUAROCKS_MIRROR + string "LuaRocks mirror" + default "http://luarocks.org/repositories/rocks" + help + LuaRocks repository. + + See http://luarocks.org + endmenu config BR2_JLEVEL diff --git a/Makefile b/Makefile index 7624f59..9dfb1e0 100644 --- a/Makefile +++ b/Makefile @@ -512,6 +512,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f endif + rm -rf $(TARGET_DIR)/usr/lib/luarocks $(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true if test -d $(TARGET_DIR)/lib/modules; then \ find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \ diff --git a/package/Makefile.in b/package/Makefile.in index f5d6289..2e433fd 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -371,5 +371,6 @@ include package/pkg-utils.mk include package/pkg-download.mk include package/pkg-autotools.mk include package/pkg-cmake.mk +include package/pkg-luarocks.mk include package/pkg-python.mk include package/pkg-generic.mk diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 149af0f..85b6866 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -40,3 +40,6 @@ define HOST_LUAROCKS_INSTALL_CMDS endef $(eval $(host-generic-package)) + +LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/5.1/?.lua" \ + $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk new file mode 100644 index 0000000..e82818a --- /dev/null +++ b/package/pkg-luarocks.mk @@ -0,0 +1,82 @@ +################################################################################ +# LuaRocks package infrastructure +# see http://luarocks.org/ +# +# This file implements an infrastructure that eases development of +# package .mk files for LuaRocks packages. +# LuaRocks supports various build.type : builtin, make, cmake. +# This luarocks infrastructure supports only the builtin mode, +# the make & cmake modes could be directly handled by generic & cmake infrastructure. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this LuaRocks infrastructure requires +# the .mk file to only specify metadata informations about the +# package: name, version, etc. +# +################################################################################ + +################################################################################ +# inner-luarocks-package -- defines how the configuration, compilation and +# installation of a LuaRocks package should be done, implements a few hooks to +# tune the build process and calls the generic package infrastructure to +# generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including an HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the package directory prefix +# argument 5 is the type (target or host) +################################################################################ + +define inner-luarocks-package + +$(2)_BUILD_OPT ?= +$(2)_SUBDIR ?= $(1)-$(shell echo "$($(3)_VERSION)" | sed -e "s/-[0-9]$$//") +$(2)_ROCKSPEC ?= $(1)-$($(3)_VERSION).rockspec +$(2)_SOURCE ?= $(1)-$($(3)_VERSION).src.rock +$(2)_SITE ?= $(call qstrip,$(BR2_LUAROCKS_MIRROR)) + +# Since we do not support host-luarocks-package, we know this is +# a target package, and can just add the required dependencies +$(2)_DEPENDENCIES += host-luarocks luainterpreter + +# $(2)_DEPENDENCIES are handled for configure step (too late) +# but host-luarocks is required to do the extract +$(1)-extract: host-luarocks + +# +# Extract step +# +ifndef $(2)_EXTRACT_CMDS +define $(2)_EXTRACT_CMDS + cd $$($(2)_DIR)/.. && \ + $$(LUAROCKS_RUN) unpack --force $(DL_DIR)/$$($(2)_SOURCE) +endef +endif + +# +# Build/install step. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$($(2)_SRCDIR) && \ + $$(LUAROCKS_RUN) make --deps-mode=none --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPT) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5)) + +endef + +################################################################################ +# luarocks-package -- the target generator macro for LuaRocks packages +################################################################################ + +luarocks-package = $(call inner-luarocks-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +# host-luarocks-package not supported