From patchwork Wed Jul 1 08:10:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 489898 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C99C31402D1 for ; Wed, 1 Jul 2015 18:11:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Nq1cL3Px; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EEBA091D32; Wed, 1 Jul 2015 08:11: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 Wjcec8dNQovt; Wed, 1 Jul 2015 08:11:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B774F91D20; Wed, 1 Jul 2015 08:11:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EC3FC1C21BB for ; Wed, 1 Jul 2015 08:11:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E79C791D0D for ; Wed, 1 Jul 2015 08:11:07 +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 GCWd0m0lrHVl for ; Wed, 1 Jul 2015 08:11:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 704EE91D17 for ; Wed, 1 Jul 2015 08:11:06 +0000 (UTC) Received: by pdbci14 with SMTP id ci14so21547458pdb.2 for ; Wed, 01 Jul 2015 01:11:06 -0700 (PDT) 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=8bA2Ssndq2/T4lA+AC0KI9/sgmoZYcUtEBGRx78pbZM=; b=Nq1cL3PxP3GYBy0//e6NbZ5YBsX7MAQAWMh2F1TJpAQFtnqPgA5dLg9UlNmHTuY+tW W5V5jTN+Jn8BUi8SbzCjKnpv6Uy6LGesfiDhdhzcvI0ujXpj00sWmf5BD3DubKFAxCj+ NfKgIt7KS31hEMjqSQtzrWFE9fv7dYbpIyoxqN71h/MxTZCSj6YfUaLHVuDvEHUO3nab FQ4NQ6DDENey7GtD5T3tIVmqvPSEh3uQ8YhW84DriWM01VyE4bBT3KEEg2EOuSHyWFzJ HKgJex2p21QwNzdDYHZY877IFP/0p2zOr/g7eHnXZNF+JAEcDh2RKR+gVHLJP68/bqPY e5rw== X-Received: by 10.68.222.167 with SMTP id qn7mr51678644pbc.136.1435738266134; Wed, 01 Jul 2015 01:11:06 -0700 (PDT) Received: from ld2077.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id kp2sm1308251pab.12.2015.07.01.01.11.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jul 2015 01:11:05 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Wed, 1 Jul 2015 10:10:47 +0200 Message-Id: <1435738247-9015-3-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435738247-9015-1-git-send-email-fabio.porcedda@gmail.com> References: <1435738247-9015-1-git-send-email-fabio.porcedda@gmail.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v5 2/2] pkg-luarocks: fix top-level parallel makefile support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" In the *-install-target phase the manifest file is being updated, if multiply packages try to update it they fail. To avoid multiple access to the manifest file use flock to sync multiple luarocks packages. e.g. installing three luarocks packages: make lua-cjson-build lua-coat-build lua-coatpersistent-build make lua-cjson lua-coat lua-coatpersistent -j Fix error: Updating manifest for /home/tetsuya/buildroot/br2/output/target/usr/lib/luarocks/rocks No existing manifest. Attempting to rebuild... Error: rock_manifest file not found for lua-coat 0.9.1-1 - not a LuaRocks 2 tree? Signed-off-by: Fabio Porcedda --- package/luarocks/luarocks.mk | 6 ++++-- package/pkg-luarocks.mk | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 2b6c975..413e23d 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -53,8 +53,10 @@ endef $(eval $(host-generic-package)) -LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks +LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" +LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks + +LUAROCKS_RUN = $(LUAROCKS_RUN_ENV) $(LUAROCKS_RUN_CMD) define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index 83f338e..0a7ba47 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -58,8 +58,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$($(2)_SRCDIR) && \ - $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) + cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) flock $$(TARGET_DIR) \ + $$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) endef endif