From patchwork Tue Sep 10 03:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1159990 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FmcmVFiF"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46S9Y92gKXz9s00 for ; Tue, 10 Sep 2019 13:31:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 36783203F2; Tue, 10 Sep 2019 03:31:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dnxf5hyYjpKE; Tue, 10 Sep 2019 03:31:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6B9D92041D; Tue, 10 Sep 2019 03:31:03 +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 122D71BF591 for ; Tue, 10 Sep 2019 03:31:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 09D3485F8E for ; Tue, 10 Sep 2019 03:31:02 +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 echpM+SBTzez for ; Tue, 10 Sep 2019 03:31:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 12A0C85C77 for ; Tue, 10 Sep 2019 03:31:01 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id g7so17066942wrx.2 for ; Mon, 09 Sep 2019 20:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/fNoZaDzy4ehMNSosjA+iSThwGp2T4VbzBvdBRWF6Kk=; b=FmcmVFiFtyGgmSDvN5tnf9rxvl1fotlITilm38/bS99LxVsr49QZbtzpZAFln7T++a YEsB7h1uijJKZy4Oqp7AbTmI9q3bsWT98FOp9QOSUiUitPPi3QwXmcfU67fug6NA5lD7 82S3stqMce2XLtSxsWn++EfjKsqJT4m7IRTA4y3b41xhYct5gnK8rzYxcgl6RLPqtiZY KslvSnvdWydQiHunrZvwKHDkAA3vOBPYfiOX/ErpJHsHqGFZCizTBzMjJEAbmaMZJENy 8TQuhR/g0tnH3auGF2oaHNZUCRzVxuHvEExFMxm6v9GnsPh1x+BfPi63kmjyIMAsUntK ZJ4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/fNoZaDzy4ehMNSosjA+iSThwGp2T4VbzBvdBRWF6Kk=; b=rS2UrjEzsiHhX2VSxtJ72nG4htLug2GyJg7bOa7sfJ6sPaTZdSAjxkxFS/Gt1ZJ0/f rf/hRFSe0UpAdsZ6mGSFHDHIk5Qh0blWUC39NkJ7olgS+nwQ9HySU+9U7zOymIHefbfK uE+pmF7TBRrB+h0LoqGX68pYyhTIiSARrMPJTT7y+druCvfBX8idGh0IEAwo+uUvEZyB kSL3A6RYj+ra13p/FtMiRKRCwQiuLWewak88zgEHhzFbaZdpFglgl6GapJYuM9FQB52O Qo/m2xUi6XF8Fp+zPtmK8x2Y/S2KpXSrIUnALgsL2/fYuAhB3kvxw+JvEchWBSMXY2gZ wvUw== X-Gm-Message-State: APjAAAWcP35sILNrNztC9RcAs+kyh61sScIz5nRyF9HPcd45ULw/jPEd tN5v6mNcEJ5/HMKRmdcj9tnalvSH X-Google-Smtp-Source: APXvYqy2HUraAJI2J0IftU7dWtIhMyX11d4QHYskqvZsdPXkbufYu6tPHoN2RmvXjjkJ29t523CgGw== X-Received: by 2002:adf:dcc4:: with SMTP id x4mr14966942wrm.221.1568086259320; Mon, 09 Sep 2019 20:30:59 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id x6sm3045868wmf.38.2019.09.09.20.30.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2019 20:30:58 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 10 Sep 2019 05:30:07 +0200 Message-Id: <20190910033009.4252-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [LuaRocks 1/3] package/luarocks: bump to version 3.2.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Francois Perrad --- .../luarocks/0001-allow-libluajit-detection.patch | 12 ++++++------ package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/luarocks/0001-allow-libluajit-detection.patch b/package/luarocks/0001-allow-libluajit-detection.patch index 5a7bc3f57..e0ff85d40 100644 --- a/package/luarocks/0001-allow-libluajit-detection.patch +++ b/package/luarocks/0001-allow-libluajit-detection.patch @@ -1,6 +1,6 @@ -From 961269271134e711bcfffebb0f179ffddcbf3d5a Mon Sep 17 00:00:00 2001 +From fedd1259e47a6f6cb97bce8c9bf31eeb261b93be Mon Sep 17 00:00:00 2001 From: Francois Perrad -Date: Sun, 29 Jul 2018 11:17:34 +0200 +Date: Sat, 27 Jul 2019 15:26:26 +0200 Subject: [PATCH] allow libluajit detection This detection was done only if luarocks is runned by luajit. @@ -14,21 +14,21 @@ Signed-off-by: Francois Perrad 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua -index 8403f12..c1c0220 100644 +index cb85764..02cdda6 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua -@@ -544,10 +544,8 @@ function deps.check_lua(vars) +@@ -555,10 +555,8 @@ function deps.check_lua_libdir(vars) "lua-" .. cfg.lua_version, "lua-" .. shortv, "lua", + "luajit-" .. cfg.lua_version, } -- if cfg.luajit_version then +- if ljv then - table.insert(libnames, 1, "luajit-" .. cfg.lua_version) - end local cache = {} for _, libname in ipairs(libnames) do local ok = check_external_dependency("LUA", { library = libname }, vars, "build", cache) -- -2.17.1 +2.20.1 diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 0e65659c4..3bcd22fbe 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513 luarocks-3.1.3.tar.gz +sha256 f27e20c9cdb3ffb991ccdb85796c36a0690566676f8e1a59b0d0ee6598907d04 luarocks-3.2.1.tar.gz sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index d7d0e4077..450561228 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.1.3 +LUAROCKS_VERSION = 3.2.1 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From patchwork Tue Sep 10 03:30:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1159992 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JjzAE5eV"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46S9YB735yz9sNT for ; Tue, 10 Sep 2019 13:31:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6DD62878A0; Tue, 10 Sep 2019 03:31:08 +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 bOwUDmV64-Mi; Tue, 10 Sep 2019 03:31:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CDCC88788B; Tue, 10 Sep 2019 03:31:07 +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 A49F31BF591 for ; Tue, 10 Sep 2019 03:31:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A22AC85C9A for ; Tue, 10 Sep 2019 03:31:04 +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 O8EbGW1H6yIa for ; Tue, 10 Sep 2019 03:31:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4B07985C77 for ; Tue, 10 Sep 2019 03:31:03 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id t16so17026929wra.6 for ; Mon, 09 Sep 2019 20:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3pUWS/xr4XATZqtMk0tnSF8tNyk3BOMQFH062WwFF0I=; b=JjzAE5eVLUa1N1/hTzhGFlbgKag0FsUeMPUpBDCgFbDgUi+IikhYpKQNiVF9aoJgPX Ik1hwQx2UsE2MQebEO6zeUTa4T92678K0tcK0fXo/9QbU8oR6/d0zGBGhh9XYC7tLKWw 4JTeUfSQeCUPc8xyXxPyr+VCBgRi7fMkqV/xupnZRgrhhnI/6n0FVE75qBPvT8a/cVmh N6w4DnsS8N4m6MaaKxyvp6U3IYp5wjoTJVq0lsizYR+/y/9puOO+3VMzMWXH1+PEU0Xu IwQU5etw2WnyyvZIEbKvUFPlG0Db1QTOZJWZn53Qzt+c8sBvAZHwZIWwvAHf68JYmgil dd5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3pUWS/xr4XATZqtMk0tnSF8tNyk3BOMQFH062WwFF0I=; b=eFERCyn0Pq7VOBa1GQ1kaFJV6VlvrPaZPy0ngzB0ue7Esn8KdWTRIfew3LsAMrdjrr ZiPpXj/SjCSNBNgKDMdJIBK5mx1kDgr74jBwg4CE/3g76aXgYGO7TJ/yEwA1ZFYKCpWV iI+rRGLZhzYnQ2LM4sUN0PNmJ1ILn1iFwQfY3YEuh4PPAD4NRff/DRO8txCuiwn0RWy4 Q3T8ET0l6HkKY8o84N/V41gYOvioBDDQBaz2XKCXyiDZjkCOAntg0soSz0IgLpcFqCZG 5W0rUJiq8l9rrh91sFxOHDzk7PBtYPJcKckTx83QuUzwNIpzeejaPW5jct7k3rkLwbc3 2i6g== X-Gm-Message-State: APjAAAUQyClxFRDgDen+XDgihUg0THyC0AqmTON9pxnUHMTsEaPosX81 vIUbHDfTVhxAYsfSvswc6rZoh+ZO X-Google-Smtp-Source: APXvYqx2gDmWg9AfAO3iLz3gOml2fagEvJjtfMjDVIsnikMngg92FM0R3Hg4r68IfVRM6EH3mogqJQ== X-Received: by 2002:a5d:448a:: with SMTP id j10mr21968375wrq.82.1568086261532; Mon, 09 Sep 2019 20:31:01 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id x6sm3045868wmf.38.2019.09.09.20.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2019 20:31:01 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 10 Sep 2019 05:30:09 +0200 Message-Id: <20190910033009.4252-3-francois.perrad@gadz.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910033009.4252-1-francois.perrad@gadz.org> References: <20190910033009.4252-1-francois.perrad@gadz.org> MIME-Version: 1.0 Subject: [Buildroot] [LuaRocks 3/3] package/luarocks: refactor our BR addon with new API X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" the wellknown module `argparse` is now used by LuaRocks 3.2.0, instead of a homemade parsing argurment. Signed-off-by: Francois Perrad --- package/luarocks/buildroot.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 35223c119..e829b6db0 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -10,15 +10,20 @@ local search = require("luarocks.search") local download = require("luarocks.download") local fetch = require("luarocks.fetch") -buildroot.help_summary = "generate buildroot package files of a rock." -buildroot.help_arguments = "rockname [brname]" -buildroot.help = [[ +function buildroot.add_to_parser(parser) + local cmd = parser:command("buildroot", [[ This addon generates Buildroot package files of a rock. First argument is the name of a rock, the second argument is optional and needed when Buildroot uses another name (usually prefixed by lua-). Files are generated with the source content of the rock and more especially the rockspec. So, the rock is downloaded and unpacked. -]] +]], util.see_also()) + :summary("generate buildroot package files of a rock.") + + cmd:argument("rockname", "the name of a rock to be fetched and unpacked.") + cmd:argument("brname", "the name used by Buildroot.") + :args("?") +end local function brname (name) return name:upper():gsub('-', '_') @@ -309,15 +314,10 @@ local function generate_test (rockspec, lcname) end --- Driver function for the "buildroot" command. --- @param rockname string: the name of a rock to be fetched and unpacked. --- @param brname string: the name used by Buildroot (optional) -- @return boolean: true if successful -function buildroot.command(flags, rockname, fsname) - if type(rockname) ~= 'string' then - return nil, "Argument missing. "..util.see_help('buildroot') - end - fsname = fsname or rockname - assert(type(fsname) == 'string') +function buildroot.command(args) + local rockname = assert(args.rockname) + local fsname = args.brname or rockname local query = queries.new(rockname:lower(), nil, false, 'src') local url, err = search.find_suitable_rock(query)