From patchwork Sat Nov 10 14:08:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 995893 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.137; helo=fraxinus.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="nSqiKOUT"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42sf5w03Jcz9s8T for ; Sun, 11 Nov 2018 01:09:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 256A3862C1; Sat, 10 Nov 2018 14:09:21 +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 3lFTYnEbZ6nC; Sat, 10 Nov 2018 14:09:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F612862CA; Sat, 10 Nov 2018 14:09:19 +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 522B51C1533 for ; Sat, 10 Nov 2018 14:09:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F43E821D8 for ; Sat, 10 Nov 2018 14: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 nVk7ytm7kaGn for ; Sat, 10 Nov 2018 14:09:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id D82F987234 for ; Sat, 10 Nov 2018 14:09:08 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id u9-v6so4738939wrr.0 for ; Sat, 10 Nov 2018 06:09:08 -0800 (PST) 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; bh=UKgOzbZrIy8fkNqTQuYNg8m7XJqEjkUvmEKmV+Vu2zM=; b=nSqiKOUTdA9TYFWzP/Tf6TSRNZTncs2pWBaPutzJbHoZ/V/mB5QgCBoxMdOdn7wYFu q14Lov/vmr6ehIhfvxRwgUWhRM3YXkklFHP1gHxTmMPO61lIREla99Jfw/8BrjLYU/51 tDJG4EEGZ7To+nHBjKOHHn8F5NZnBn95HHMCRBKZCSsandIvZiyR+SbDsNooTAmXaLr7 hd0pyqHb44lnax0xjL21wjwQfRWvTxxczOSk6AO5qBYgMTVE2YS9KMsvC7F2FqgP5g7h 6ls+c6/sywvkmid3KNq0hRFzdrdozx9fhrVlmW437b/sWPkJlOApsQpD8IxI0OJ1xz8E FpRw== 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; bh=UKgOzbZrIy8fkNqTQuYNg8m7XJqEjkUvmEKmV+Vu2zM=; b=Qznn2txTrRY7ZvrtuTVJ5DpAtFKXiKZV70CMVoh7urfSwwEqa/ArvZvoQu+qcwr4oT fpbqoaLiDnqob/3683vXFZxGihpHDLF0r7+y6M5sbUIt5emM7pURBnGAuorGNali45M/ WpQJfQyDrSHo2zB8Mwga9qPu6+vBJdXoI3P9RZRyM0wAdmqyf6/p/SyTRuYOe7Gso6si g95lGje3aVjjTUqFNHZosVGm6/eKIH/j7qlJLn6tDm7YIh8pSYeaseFT3YmPRD+vnFCm /P7HlFob3LDov+cbPJhy+mez1nhxBEg0gyMtdbaMYjzg0nWrag/m3a8TTFuRpzIkHBku eQjw== X-Gm-Message-State: AGRZ1gK93A+dCTpvj3ov88DW+KZmq8T95uj2uNANBig7PhP84/yFJj7C x8n2bli6rwRuwW+EUcrrWQ8W40X1 X-Google-Smtp-Source: AJdET5fmYCp7Rm2M+zrGdTrZE0YgC4RzmvHbDDnGmdWZUZ2Vl3NL8wrdAKcABWTfxWKX/HiHERIotg== X-Received: by 2002:a5d:5685:: with SMTP id f5-v6mr11144246wrv.113.1541858947007; Sat, 10 Nov 2018 06:09:07 -0800 (PST) Received: from vb-18.04 (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id b66-v6sm3226208wmb.21.2018.11.10.06.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Nov 2018 06:09:06 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sat, 10 Nov 2018 15:08:29 +0100 Message-Id: <20181110140832.9700-3-francois.perrad@gadz.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181110140832.9700-1-francois.perrad@gadz.org> References: <20181110140832.9700-1-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 2/5] lua*: regeneration of *.mk files 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Francois Perrad --- package/argparse/argparse.mk | 3 +-- package/copas/copas.mk | 2 +- package/lsqlite3/lsqlite3.mk | 2 +- package/lua-basexx/lua-basexx.mk | 4 +--- package/lua-fifo/lua-fifo.mk | 4 ++-- package/lua-flu/lua-flu.mk | 2 +- package/lua-markdown/lua-markdown.mk | 2 +- package/lua-sailor/lua-sailor.mk | 2 +- package/luadbi-sqlite3/luadbi-sqlite3.mk | 2 +- package/luadbi/luadbi.mk | 2 +- package/luaexpat/luaexpat.mk | 2 +- package/luafilesystem/luafilesystem.mk | 4 ++-- package/orbit/orbit.mk | 7 ++++--- package/wsapi-fcgi/wsapi-fcgi.mk | 12 +++++++----- package/wsapi-xavante/wsapi-xavante.mk | 10 ++++++---- package/wsapi/wsapi.mk | 4 +++- 16 files changed, 34 insertions(+), 30 deletions(-) diff --git a/package/argparse/argparse.mk b/package/argparse/argparse.mk index 095f0a315..1b5bb159b 100644 --- a/package/argparse/argparse.mk +++ b/package/argparse/argparse.mk @@ -4,8 +4,7 @@ # ################################################################################ -ARGPARSE_VERSION_UPSTREAM = 0.5.0 -ARGPARSE_VERSION = $(ARGPARSE_VERSION_UPSTREAM)-1 +ARGPARSE_VERSION = 0.5.0-1 ARGPARSE_SUBDIR = argparse ARGPARSE_LICENSE = MIT ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE diff --git a/package/copas/copas.mk b/package/copas/copas.mk index 988692c4a..5b7ba9997 100644 --- a/package/copas/copas.mk +++ b/package/copas/copas.mk @@ -7,6 +7,6 @@ COPAS_VERSION = 2.0.2-1 COPAS_SUBDIR = copas-2_0_2 COPAS_LICENSE = MIT -COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/doc/us/license.html +COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/LICENSE $(eval $(luarocks-package)) diff --git a/package/lsqlite3/lsqlite3.mk b/package/lsqlite3/lsqlite3.mk index 6f6445d93..fab2e0886 100644 --- a/package/lsqlite3/lsqlite3.mk +++ b/package/lsqlite3/lsqlite3.mk @@ -6,7 +6,7 @@ LSQLITE3_VERSION = 0.9.4-2 LSQLITE3_SUBDIR = lsqlite3_fsl09x -LSQLITE3_DEPENDENCIES = sqlite LSQLITE3_LICENSE = MIT +LSQLITE3_DEPENDENCIES = sqlite $(eval $(luarocks-package)) diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index bfdc1e27b..5aa5ecf21 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,10 +4,8 @@ # ################################################################################ -LUA_BASEXX_VERSION_UPSTREAM =0.4.0 -LUA_BASEXX_VERSION = $(LUA_BASEXX_VERSION_UPSTREAM)-1 +LUA_BASEXX_VERSION = 0.4.0-1 LUA_BASEXX_NAME_UPSTREAM = basexx -LUA_BASEXX_SUBDIR = basexx-$(LUA_BASEXX_VERSION_UPSTREAM) LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE diff --git a/package/lua-fifo/lua-fifo.mk b/package/lua-fifo/lua-fifo.mk index 875b89577..8b15fc1fc 100644 --- a/package/lua-fifo/lua-fifo.mk +++ b/package/lua-fifo/lua-fifo.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_FIFO_VERSION_UPSTREAM =0.2 -LUA_FIFO_VERSION =$(LUA_FIFO_VERSION_UPSTREAM)-0 +LUA_FIFO_VERSION_UPSTREAM = 0.2 +LUA_FIFO_VERSION = $(LUA_FIFO_VERSION_UPSTREAM)-0 LUA_FIFO_NAME_UPSTREAM = fifo LUA_FIFO_SUBDIR = fifo.lua-$(LUA_FIFO_VERSION_UPSTREAM) LUA_FIFO_LICENSE = MIT diff --git a/package/lua-flu/lua-flu.mk b/package/lua-flu/lua-flu.mk index 7cfea8e6d..c01a4848c 100644 --- a/package/lua-flu/lua-flu.mk +++ b/package/lua-flu/lua-flu.mk @@ -5,7 +5,7 @@ ################################################################################ LUA_FLU_VERSION = 20150331-1 -LUA_FLU_NAME_UPSTREAM = flu +LUA_FLU_NAME_UPSTREAM = Flu LUA_FLU_SUBDIR = doub-flu-a7daae986339 LUA_FLU_LICENSE = MIT LUA_FLU_LICENSE_FILES = $(LUA_FLU_SUBDIR)/doc/LICENSE.txt diff --git a/package/lua-markdown/lua-markdown.mk b/package/lua-markdown/lua-markdown.mk index a98f3125a..d35f8be83 100644 --- a/package/lua-markdown/lua-markdown.mk +++ b/package/lua-markdown/lua-markdown.mk @@ -5,7 +5,7 @@ ################################################################################ LUA_MARKDOWN_VERSION = 0.33-1 -LUA_MARKDOWN_NAME_UPSTREAM = markdown +LUA_MARKDOWN_NAME_UPSTREAM = Markdown LUA_MARKDOWN_SUBDIR = markdown LUA_MARKDOWN_LICENSE = MIT LUA_MARKDOWN_LICENSE_FILES = $(LUA_MARKDOWN_SUBDIR)/LICENSE diff --git a/package/lua-sailor/lua-sailor.mk b/package/lua-sailor/lua-sailor.mk index 17fbd7c61..f88e03591 100644 --- a/package/lua-sailor/lua-sailor.mk +++ b/package/lua-sailor/lua-sailor.mk @@ -5,7 +5,7 @@ ################################################################################ LUA_SAILOR_VERSION = 0.5-4 -LUA_SAILOR_NAME_UPSTREAM = sailor +LUA_SAILOR_NAME_UPSTREAM = Sailor LUA_SAILOR_SUBDIR = sailor LUA_SAILOR_LICENSE = MIT LUA_SAILOR_LICENSE_FILES = $(LUA_SAILOR_SUBDIR)/LICENSE diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.mk b/package/luadbi-sqlite3/luadbi-sqlite3.mk index 422fa1e31..44cf4d107 100644 --- a/package/luadbi-sqlite3/luadbi-sqlite3.mk +++ b/package/luadbi-sqlite3/luadbi-sqlite3.mk @@ -5,8 +5,8 @@ ################################################################################ LUADBI_SQLITE3_VERSION = 0.6-2 -LUADBI_SQLITE3_LICENSE = MIT LUADBI_SQLITE3_SUBDIR = luadbi +LUADBI_SQLITE3_LICENSE = MIT LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING LUADBI_SQLITE3_DEPENDENCIES = sqlite diff --git a/package/luadbi/luadbi.mk b/package/luadbi/luadbi.mk index 268e0e628..969c01ee2 100644 --- a/package/luadbi/luadbi.mk +++ b/package/luadbi/luadbi.mk @@ -5,8 +5,8 @@ ################################################################################ LUADBI_VERSION = 0.6-2 -LUADBI_LICENSE = MIT LUADBI_SUBDIR = luadbi +LUADBI_LICENSE = MIT LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING $(eval $(luarocks-package)) diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index c7377f6af..1ea1fafce 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -5,8 +5,8 @@ ################################################################################ LUAEXPAT_VERSION = 1.3.0-1 -LUAEXPAT_DEPENDENCIES = expat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/doc/us/license.html +LUAEXPAT_DEPENDENCIES = expat $(eval $(luarocks-package)) diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index bde04267c..37f265e2b 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -5,8 +5,8 @@ ################################################################################ LUAFILESYSTEM_VERSION = 1.7.0-2 -LUAFILESYSTEM_LICENSE = MIT -LUAFILESYSTEM_LICENSE_FILES = luafilesystem/LICENSE LUAFILESYSTEM_SUBDIR = luafilesystem +LUAFILESYSTEM_LICENSE = MIT +LUAFILESYSTEM_LICENSE_FILES = $(LUAFILESYSTEM_SUBDIR)/LICENSE $(eval $(luarocks-package)) diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk index 3329439db..77549a28c 100644 --- a/package/orbit/orbit.mk +++ b/package/orbit/orbit.mk @@ -4,10 +4,11 @@ # ################################################################################ -ORBIT_VERSION_UPSTREAM = 2.2.4 -ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1 +ORBIT_VERSION = 2.2.4-1 ORBIT_SUBDIR = orbit ORBIT_LICENSE = MIT -ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md +ORBIT_LICENSE_FILES = \ + $(ORBIT_SUBDIR)/doc/us/license.html \ + $(ORBIT_SUBDIR)/doc/us/license.md $(eval $(luarocks-package)) diff --git a/package/wsapi-fcgi/wsapi-fcgi.mk b/package/wsapi-fcgi/wsapi-fcgi.mk index 2b0e6b255..7f4e12cc7 100644 --- a/package/wsapi-fcgi/wsapi-fcgi.mk +++ b/package/wsapi-fcgi/wsapi-fcgi.mk @@ -4,11 +4,13 @@ # ################################################################################ -WSAPI_FCGI_VERSION_MAJOR = 1.6.1 -WSAPI_FCGI_VERSION = $(WSAPI_FCGI_VERSION_MAJOR)-1 -WSAPI_FCGI_SUBDIR = wsapi-$(WSAPI_FCGI_VERSION_MAJOR) -WSAPI_FCGI_DEPENDENCIES = libfcgi +WSAPI_FCGI_VERSION_UPSTREAM = 1.6.1 +WSAPI_FCGI_VERSION = $(WSAPI_FCGI_VERSION_UPSTREAM)-1 +WSAPI_FCGI_SUBDIR = wsapi-$(WSAPI_FCGI_VERSION_UPSTREAM) WSAPI_FCGI_LICENSE = MIT -WSAPI_FCGI_LICENSE_FILES = $(WSAPI_FCGI_SUBDIR)/doc/us/license.html +WSAPI_FCGI_LICENSE_FILES = \ + $(WSAPI_FCGI_SUBDIR)/doc/us/license.html \ + $(WSAPI_FCGI_SUBDIR)/doc/us/license.md +WSAPI_FCGI_DEPENDENCIES = libfcgi $(eval $(luarocks-package)) diff --git a/package/wsapi-xavante/wsapi-xavante.mk b/package/wsapi-xavante/wsapi-xavante.mk index 86f5dee50..22226e332 100644 --- a/package/wsapi-xavante/wsapi-xavante.mk +++ b/package/wsapi-xavante/wsapi-xavante.mk @@ -4,10 +4,12 @@ # ################################################################################ -WSAPI_XAVANTE_VERSION_MAJOR = 1.6.1 -WSAPI_XAVANTE_VERSION = $(WSAPI_XAVANTE_VERSION_MAJOR)-1 -WSAPI_XAVANTE_SUBDIR = wsapi-$(WSAPI_XAVANTE_VERSION_MAJOR) +WSAPI_XAVANTE_VERSION_UPSTREAM = 1.6.1 +WSAPI_XAVANTE_VERSION = $(WSAPI_XAVANTE_VERSION_UPSTREAM)-1 +WSAPI_XAVANTE_SUBDIR = wsapi-$(WSAPI_XAVANTE_VERSION_UPSTREAM) WSAPI_XAVANTE_LICENSE = MIT -WSAPI_XAVANTE_LICENSE_FILES = $(WSAPI_XAVANTE_SUBDIR)/doc/us/license.html +WSAPI_XAVANTE_LICENSE_FILES = \ + $(WSAPI_XAVANTE_SUBDIR)/doc/us/license.html \ + $(WSAPI_XAVANTE_SUBDIR)/doc/us/license.md $(eval $(luarocks-package)) diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk index 64a27579f..fee1d6790 100644 --- a/package/wsapi/wsapi.mk +++ b/package/wsapi/wsapi.mk @@ -6,6 +6,8 @@ WSAPI_VERSION = 1.6.1-1 WSAPI_LICENSE = MIT -WSAPI_LICENSE_FILES = $(WSAPI_SUBDIR)/doc/us/license.html +WSAPI_LICENSE_FILES = \ + $(WSAPI_SUBDIR)/doc/us/license.html \ + $(WSAPI_SUBDIR)/doc/us/license.md $(eval $(luarocks-package))