All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [scanrock 0/5] scanrock
@ 2018-10-21 16:32 Francois Perrad
  2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

This serie introduces `scanrock` which populates BR files for Luarocks
infrastructure.

And now, like with perl modules, I can upgrade easily lua modules.

Francois Perrad (5):
  utils/scanrock: new utility for Luarocks infrastructure
  lua*: regeneration of hash files
  lua*: regeneration of *.mk files
  lua*: regeneration of Config.in
  [RFC] pkg-luarocks: add per package upgrade target

 docs/manual/adding-packages-luarocks.txt      |  12 +
 package/argparse/Config.in                    |   6 +-
 package/argparse/argparse.hash                |   5 +-
 package/argparse/argparse.mk                  |   3 +-
 package/cgilua/Config.in                      |   7 +-
 package/cgilua/cgilua.hash                    |   3 +-
 package/copas/Config.in                       |  12 +-
 package/copas/copas.hash                      |   3 +-
 package/copas/copas.mk                        |   2 +-
 package/coxpcall/Config.in                    |   6 +-
 package/coxpcall/coxpcall.hash                |   3 +-
 package/dado/Config.in                        |   4 +-
 package/dado/dado.hash                        |   3 +-
 package/ljlinenoise/Config.in                 |   7 +-
 package/ljlinenoise/ljlinenoise.hash          |   5 +-
 package/ljsyscall/Config.in                   |   6 +-
 package/lpeg/Config.in                        |   6 +-
 package/lpeg/lpeg.hash                        |   4 +-
 package/lpty/Config.in                        |   4 +-
 package/lpty/lpty.hash                        |   5 +-
 package/lrandom/Config.in                     |   4 +-
 package/lrandom/lrandom.hash                  |   6 +-
 package/lsqlite3/Config.in                    |   3 +-
 package/lsqlite3/lsqlite3.hash                |   4 +-
 package/lsqlite3/lsqlite3.mk                  |   2 +-
 package/lua-basexx/Config.in                  |   4 +-
 package/lua-basexx/lua-basexx.hash            |   3 +-
 package/lua-basexx/lua-basexx.mk              |   4 +-
 package/lua-bit32/Config.in                   |   4 +-
 package/lua-bit32/lua-bit32.hash              |   5 +-
 package/lua-cjson/Config.in                   |  12 +-
 package/lua-cjson/lua-cjson.hash              |   5 +-
 package/lua-coat/lua-coat.hash                |   5 +-
 package/lua-coatpersistent/Config.in          |   7 +-
 .../lua-coatpersistent.hash                   |   7 +-
 package/lua-compat53/lua-compat53.hash        |   3 +-
 package/lua-csnappy/Config.in                 |   3 +-
 package/lua-csnappy/lua-csnappy.hash          |   5 +-
 package/lua-curl/Config.in                    |   4 +-
 package/lua-curl/lua-curl.hash                |   3 +-
 package/lua-datafile/Config.in                |   5 +-
 package/lua-datafile/lua-datafile.hash        |   3 +-
 package/lua-fifo/Config.in                    |   2 +-
 package/lua-fifo/lua-fifo.hash                |   3 +-
 package/lua-fifo/lua-fifo.mk                  |   4 +-
 package/lua-flu/Config.in                     |   5 +-
 package/lua-flu/lua-flu.hash                  |   5 +-
 package/lua-flu/lua-flu.mk                    |   2 +-
 package/lua-http/Config.in                    |  16 +-
 package/lua-http/lua-http.hash                |   3 +-
 package/lua-iconv/Config.in                   |   4 +-
 package/lua-iconv/lua-iconv.hash              |   5 +-
 package/lua-iconv/lua-iconv.mk                |   2 +-
 package/lua-lpeg-patterns/Config.in           |   5 +-
 .../lua-lpeg-patterns/lua-lpeg-patterns.hash  |   3 +-
 package/lua-markdown/Config.in                |   3 +-
 package/lua-markdown/lua-markdown.hash        |   3 +-
 package/lua-markdown/lua-markdown.mk          |   2 +-
 package/lua-messagepack/Config.in             |   4 +-
 package/lua-messagepack/lua-messagepack.hash  |   3 +-
 package/lua-periphery/Config.in               |   4 +-
 package/lua-periphery/lua-periphery.hash      |   5 +-
 package/lua-resty-http/Config.in              |   2 +-
 package/lua-resty-http/lua-resty-http.hash    |   3 +-
 package/lua-sailor/Config.in                  |  20 +-
 package/lua-sailor/lua-sailor.hash            |   3 +-
 package/lua-sailor/lua-sailor.mk              |   2 +-
 package/lua-sdl2/Config.in                    |   6 +-
 package/lua-stdlib/Config.in                  |   7 +-
 package/lua-stdlib/lua-stdlib.hash            |   3 +-
 package/lua-testmore/Config.in                |   2 +-
 package/lua-testmore/lua-testmore.hash        |   5 +-
 package/lua-utf8/Config.in                    |   3 +-
 package/lua-utf8/lua-utf8.hash                |   2 +-
 package/lua-valua/Config.in                   |   5 +-
 package/lua-valua/lua-valua.hash              |   3 +-
 package/luabitop/Config.in                    |   5 +-
 package/luabitop/luabitop.hash                |   4 +-
 package/luacrypto/Config.in                   |   8 +-
 package/luacrypto/luacrypto.hash              |   5 +-
 package/luadbi-sqlite3/Config.in              |   5 +-
 package/luadbi-sqlite3/luadbi-sqlite3.hash    |   3 +-
 package/luadbi-sqlite3/luadbi-sqlite3.mk      |   2 +-
 package/luadbi/Config.in                      |   6 +-
 package/luadbi/luadbi.hash                    |   3 +-
 package/luadbi/luadbi.mk                      |   2 +-
 package/luaexpat/Config.in                    |   5 +-
 package/luaexpat/luaexpat.hash                |   5 +-
 package/luaexpat/luaexpat.mk                  |   2 +-
 package/luafilesystem/Config.in               |   4 +-
 package/luafilesystem/luafilesystem.hash      |   3 +-
 package/luafilesystem/luafilesystem.mk        |   4 +-
 package/luajson/Config.in                     |   6 +-
 package/luajson/luajson.hash                  |   3 +-
 package/lualogging/Config.in                  |   7 +-
 package/lualogging/lualogging.hash            |   5 +-
 package/luaossl/Config.in                     |   9 +-
 package/luaossl/luaossl.hash                  |   3 +-
 package/luaposix/Config.in                    |  10 +-
 package/luasec/Config.in                      |   7 +-
 package/luasec/luasec.hash                    |   5 +-
 package/luasocket/Config.in                   |   6 +-
 package/luasocket/luasocket.hash              |   5 +-
 package/luasql-sqlite3/Config.in              |   5 +-
 package/luasql-sqlite3/luasql-sqlite3.hash    |   5 +-
 package/lunit/Config.in                       |   2 +-
 package/lunit/lunit.hash                      |   5 +-
 package/orbit/Config.in                       |  12 +-
 package/orbit/orbit.hash                      |   2 +-
 package/orbit/orbit.mk                        |   3 +-
 package/pkg-generic.mk                        |   6 +-
 package/pkg-luarocks.mk                       |   8 +
 package/rings/Config.in                       |   5 +-
 package/rings/rings.hash                      |   5 +-
 package/wsapi-fcgi/Config.in                  |  11 +-
 package/wsapi-fcgi/wsapi-fcgi.hash            |   3 +-
 package/wsapi-fcgi/wsapi-fcgi.mk              |   8 +-
 package/wsapi-xavante/Config.in               |  15 +-
 package/wsapi-xavante/wsapi-xavante.hash      |   3 +-
 package/wsapi-xavante/wsapi-xavante.mk        |   6 +-
 package/wsapi/Config.in                       |   9 +-
 package/wsapi/wsapi.hash                      |   5 +-
 package/xavante/Config.in                     |  15 +-
 package/xavante/xavante.hash                  |   3 +-
 utils/rockspec2br.lua                         | 238 ++++++++++++++++++
 utils/scanrock                                | 128 ++++++++++
 126 files changed, 658 insertions(+), 332 deletions(-)
 create mode 100644 utils/rockspec2br.lua
 create mode 100755 utils/scanrock

-- 
2.17.1

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure
  2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
@ 2018-10-21 16:32 ` Francois Perrad
  2018-10-23 22:32   ` Arnout Vandecappelle
  2018-10-23 23:14   ` Arnout Vandecappelle
  2018-10-21 16:32 ` [Buildroot] [scanrock 2/5] lua*: regeneration of hash files Francois Perrad
                   ` (3 subsequent siblings)
  4 siblings, 2 replies; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 docs/manual/adding-packages-luarocks.txt |  12 ++
 utils/rockspec2br.lua                    | 238 +++++++++++++++++++++++
 utils/scanrock                           | 128 ++++++++++++
 3 files changed, 378 insertions(+)
 create mode 100644 utils/rockspec2br.lua
 create mode 100755 utils/scanrock

diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
index ec3d4e7cc..8b28c6fa8 100644
--- a/docs/manual/adding-packages-luarocks.txt
+++ b/docs/manual/adding-packages-luarocks.txt
@@ -50,6 +50,18 @@ Finally, on line 16, we invoke the +luarocks-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
+Most of these data can be retrieved in the +rock+ and +rockspec+,
+which are fetched from https://luarocks.org.
+So, this file and the Config.in can be generated by running
+the script +utils/scanrock foo lua-foo+ in the Buildroot directory
+(or in a br2-external tree).
+This script creates a Config.in file and lua-foo.mk file for the
+requested package.
+You should still manually edit the result.
+
+* The +package/Config.in+ file has to be updated manually to include the
+  generated Config.in files.
+
 [[luarocks-package-reference]]
 
 ==== +luarocks-package+ reference
diff --git a/utils/rockspec2br.lua b/utils/rockspec2br.lua
new file mode 100644
index 000000000..b3bc146e6
--- /dev/null
+++ b/utils/rockspec2br.lua
@@ -0,0 +1,238 @@
+--[[
+
+Copyright (C) 2018 by Francois Perrad <francois.perrad@gadz.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+This script is a part of Buildroot.
+
+]]
+
+local function usage ()
+    print [[
+Usage:
+    utils/rockspec2br [-name foo] [-subdir foo-3.2] [-license LICENSE] foo-3.2-1.rockspec
+]]
+end
+
+local function escape (s)
+    return s:gsub('-', '%%-'):gsub('%.', '%%.')
+end
+
+local function fsname (name)
+    return name:lower():gsub('_', '-')
+end
+
+local function brname (name)
+    return name:upper():gsub('-', '_')
+end
+
+local function brlicense (license)
+    if license:match('MIT/X') then
+        return 'MIT'
+    end
+    return license
+end
+
+local function wrap (txt, max)
+    local lines = {}
+    local line = ''
+    for word in txt:gmatch('(%S+)') do
+        if line:len() + word:len() > max - 1 then
+            lines[#lines+1] = line
+            line = ''
+        end
+        if line == '' then
+            line  = word
+        else
+            line = line .. ' ' .. word
+        end
+    end
+    lines[#lines+1] = line
+    return lines
+end
+
+local br_libname = {
+   curl = 'libcurl',
+   fastcgi = 'libfcgi',
+   fuse = 'libfuse',
+   iconv = 'libiconv',
+}
+
+local function get_native_dependencies ()
+    local t = {}
+    local d = external_dependencies
+    if d then
+        if d.platforms and d.platforms.unix then
+            d = d.platforms.unix
+        end
+        for k in pairs(d) do
+            if k ~= 'platforms' then
+                k = k:lower()
+                if k ~= 'crypto' then
+                    t[#t+1] = br_libname[k] or k
+                end
+            end
+        end
+        table.sort(t)
+    end
+    return t
+end
+
+local br_name = {
+    basexx = 'lua-basexx',
+    bit32 = 'lua-bit32',
+    compat53 = 'lua-compat53',
+    cqueues = 'lua-cqueues',
+    datafile = 'lua-datafile',
+    fifo = 'lua-fifo',
+    flu = 'lua-flu',
+    http = 'lua-http',
+    lpeg_patterns = 'lua-lpeg-patterns',
+    valua = 'lua-valua',
+    sailor = 'lua-sailor',
+}
+
+local function get_dependencies ()
+    local t = {}
+    for i = 1, #dependencies do
+        local dep = dependencies[i]:match('^(%S+)')
+        if dep ~= 'lua' then
+            t[#t+1] = br_name[dep] or dep
+        end
+    end
+    table.sort(t)
+    return t
+end
+
+local function generate_config (name)
+    local only_luajit = name:match('^lj')
+    local summary = description.summary or '???'
+    local homepage = description.homepage or '???'
+    local native_dependencies = get_native_dependencies()
+    local dependencies = get_dependencies()
+    local fname = 'package/' .. name .. '/Config.in'
+    local f = assert(io.open(fname, 'w'))
+    print('write ' .. fname)
+    f:write('config BR2_PACKAGE_' .. brname(name) .. '\n')
+    f:write('\tbool "' .. name .. '"\n')
+    if only_luajit then
+        f:write('\tdepends on BR2_PACKAGE_LUAJIT\n')
+    end
+    for i = 1, #native_dependencies do
+        f:write('\tselect BR2_PACKAGE_' .. brname(native_dependencies[i]) .. '\n')
+    end
+    for i = 1, #dependencies do
+        f:write('\tselect BR2_PACKAGE_' .. brname(dependencies[i]) .. ' # runtime\n')
+    end
+    f:write('\thelp\n')
+    f:write('\t  ' .. table.concat(wrap(summary, 62), '\n\t  ') .. '\n')
+    f:write('\n\t  ' .. homepage .. '\n')
+    if only_luajit then
+        f:write('\ncomment "' .. name .. ' needs LuaJIT"\n')
+        f:write('\tdepends on !BR2_PACKAGE_LUAJIT\n')
+    end
+    f:close()
+end
+
+local function generate_mk (name, subdir, license_file)
+    local need_name_upstream = false
+    local need_version_upstream = false
+    local name_upstream = package
+    local version = version
+    local version_upstream = version:match('^([^-]+)-')
+    local revision = version:match('-(%d+)$')
+    local license = description.license
+    if subdir then
+        local root = subdir:match('^(.-)-' .. escape(version) .. '$')
+        if root then
+            subdir = root .. '-$(' .. brname(name) .. '_VERSION)'
+        end
+        root = subdir:match('^(.--[Vv])' .. escape(version_upstream) .. '$')
+        if root then
+            need_version_upstream = true
+            subdir = root .. '$(' .. brname(name) .. '_VERSION_UPSTREAM)'
+        end
+        root = subdir:match('^(.-)-' .. escape(version_upstream) .. '$')
+        if root then
+            if root == name then
+                subdir = nil
+            elseif root == name_upstream then
+                subdir = nil
+                need_name_upstream = true
+            else
+                need_version_upstream = true
+                subdir = root .. '-$(' .. brname(name) .. '_VERSION_UPSTREAM)'
+            end
+        end
+    end
+    local native_dependencies = get_native_dependencies()
+    local fname = 'package/' .. name .. '/' .. name .. '.mk'
+    local f = assert(io.open(fname, 'w'))
+    print('write ' .. fname)
+    f:write('################################################################################\n')
+    f:write('#\n')
+    f:write('# ' .. name .. '\n')
+    f:write('#\n')
+    f:write('################################################################################\n')
+    f:write('\n')
+    if need_version_upstream then
+        f:write(brname(name) .. '_VERSION_UPSTREAM = ' .. version_upstream .. '\n')
+        f:write(brname(name) .. '_VERSION = $(' .. brname(name) .. '_VERSION_UPSTREAM)-' .. revision .. '\n')
+    else
+        f:write(brname(name) .. '_VERSION = ' .. version .. '\n')
+    end
+    if name ~= name_upstream:lower() or need_name_upstream then
+        f:write(brname(name) .. '_NAME_UPSTREAM = ' .. name_upstream .. '\n')
+    end
+    if subdir then
+        f:write(brname(name) .. '_SUBDIR = ' .. subdir .. '\n')
+    end
+    if license then
+        f:write(brname(name) .. '_LICENSE = ' .. brlicense(license) .. '\n')
+    end
+    if license_file then
+        f:write(brname(name) .. '_LICENSE_FILES = $(' .. brname(name) .. '_SUBDIR)/' .. license_file .. '\n')
+    end
+    if #native_dependencies > 0 then
+        f:write(brname(name) .. '_DEPENDENCIES = ' .. table.concat(native_dependencies, ' ') .. '\n')
+    end
+    f:write('\n$(eval $(luarocks-package))\n')
+    f:close()
+end
+
+local name, subdir, license
+local i = 1
+if arg[i] == '-name' then
+    name = arg[i + 1]
+    i = i + 2
+end
+if arg[i] == '-subdir' then
+    subdir = arg[i + 1]
+    i = i + 2
+end
+if arg[i] == '-license' then
+    license = arg[i + 1]
+    i = i + 2
+end
+local rockspec = arg[i]
+if not rockspec then
+    usage()
+else
+    assert(loadfile(rockspec))()
+    name = fsname(name or package)
+    generate_config(name)
+    generate_mk(name, subdir, license)
+end
diff --git a/utils/scanrock b/utils/scanrock
new file mode 100755
index 000000000..3c13b3228
--- /dev/null
+++ b/utils/scanrock
@@ -0,0 +1,128 @@
+#!/usr/bin/env perl
+
+use 5.010;
+use strict;
+use warnings;
+use Fatal qw(open close opendir closedir);
+
+use Getopt::Long;
+use Pod::Usage;
+use Cwd;
+use Digest::SHA;
+use File::Temp qw(tempdir);
+
+my ($help, $man);
+GetOptions( 'help|?' => \$help,
+            'man' => \$man,
+) or pod2usage(-exitval => 1);
+pod2usage(-exitval => 0) if $help;
+pod2usage(-exitval => 0, -verbose => 2) if $man;
+pod2usage(-exitval => 1) if scalar @ARGV == 0;
+
+my $rockname = shift @ARGV;
+my $fsname = shift @ARGV || $rockname;
+my $cwd = getcwd();
+my $tmpdir = tempdir( CLEANUP => 1 );
+
+qx{luarocks download --source ${rockname}};
+my $rock = glob q{*.src.rock};
+
+chdir $tmpdir;
+qx{luarocks unpack ${cwd}/${rock}};
+my $unpackdir = glob q{*};
+chdir $unpackdir;
+my $rockspec = File::Spec->rel2abs( glob q{*.rockspec} );
+opendir(my $dh, q{.});
+my @subdir = grep { m|^[^\.]| && -d } readdir($dh);
+my $subdir = shift @subdir;
+closedir $dh;
+chdir $subdir;
+my @license = glob q{COPY* LICENSE* doc/LICENSE* doc/license* doc/us/license*};
+my $license = shift @license;
+chdir $cwd;
+
+if ($license) {
+    print qx{lua utils/rockspec2br.lua -name ${fsname} -subdir ${subdir} -license ${license} ${rockspec}};
+}
+else {
+    print qx{lua utils/rockspec2br.lua -name ${fsname} -subdir ${subdir} ${rockspec}};
+}
+
+my $dirname = q{package/} . $fsname;
+my $hashname = $dirname . q{/} . $fsname . q{.hash};
+mkdir $dirname unless -d $dirname;
+my $sha256 = Digest::SHA->new(256)->addfile( $rock )->hexdigest();
+say qq{write ${hashname}};
+open my $fh, q{>}, $hashname;
+say {$fh} q{# computed by scanrock};
+say {$fh} qq{sha256 ${sha256}  ${rock}};
+if ($license) {
+    $sha256 = Digest::SHA->new(256)->addfile( qq{${tmpdir}/${unpackdir}/${subdir}/${license}} )->hexdigest();
+    say {$fh} qq{sha256 ${sha256}  ${subdir}/${license}};
+}
+close $fh;
+
+unlink $rock;
+
+__END__
+
+=head1 NAME
+
+utils/scanrock foo [lua-foo]
+
+=head1 SYNOPSIS
+
+utils/scanrock [options] rockname [brname]
+
+ Options:
+   -help
+   -man
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<-help>
+
+Prints a brief help message and exits.
+
+=item B<-man>
+
+Prints the manual page and exits.
+
+=back
+
+=head1 DESCRIPTION
+
+This script creates templates of the Buildroot package files for a
+Luarock module.
+
+Most of the job is delegated to C<luarocks> and to the script
+C<utils/rockspec2br.lua>, so your $(HOST_DIR)/bin must append to PATH.
+
+After running this script, it is necessary to check the generated files.
+
+See the Buildroot documentation for details on the usage of the Luarock
+infrastructure.
+
+=head1 LICENSE
+
+Copyright (C) 2018 by Francois Perrad <francois.perrad@gadz.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+This script is a part of Buildroot.
+
+=cut
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 2/5] lua*: regeneration of hash files
  2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
  2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
@ 2018-10-21 16:32 ` Francois Perrad
  2018-10-23 22:42   ` Arnout Vandecappelle
  2018-10-21 16:32 ` [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files Francois Perrad
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/argparse/argparse.hash                     | 5 +++--
 package/cgilua/cgilua.hash                         | 3 ++-
 package/copas/copas.hash                           | 3 ++-
 package/coxpcall/coxpcall.hash                     | 3 ++-
 package/dado/dado.hash                             | 3 ++-
 package/ljlinenoise/ljlinenoise.hash               | 5 +++--
 package/lpeg/lpeg.hash                             | 4 ++--
 package/lpty/lpty.hash                             | 5 +++--
 package/lrandom/lrandom.hash                       | 6 +++---
 package/lsqlite3/lsqlite3.hash                     | 4 ++--
 package/lua-basexx/lua-basexx.hash                 | 3 ++-
 package/lua-bit32/lua-bit32.hash                   | 5 +++--
 package/lua-cjson/lua-cjson.hash                   | 5 +++--
 package/lua-coat/lua-coat.hash                     | 5 +++--
 package/lua-coatpersistent/lua-coatpersistent.hash | 7 ++++---
 package/lua-compat53/lua-compat53.hash             | 3 ++-
 package/lua-csnappy/lua-csnappy.hash               | 5 +++--
 package/lua-curl/lua-curl.hash                     | 3 ++-
 package/lua-datafile/lua-datafile.hash             | 3 ++-
 package/lua-fifo/lua-fifo.hash                     | 3 ++-
 package/lua-flu/lua-flu.hash                       | 5 +++--
 package/lua-http/lua-http.hash                     | 3 ++-
 package/lua-iconv/lua-iconv.hash                   | 5 +++--
 package/lua-lpeg-patterns/lua-lpeg-patterns.hash   | 3 ++-
 package/lua-markdown/lua-markdown.hash             | 3 ++-
 package/lua-messagepack/lua-messagepack.hash       | 3 ++-
 package/lua-periphery/lua-periphery.hash           | 5 +++--
 package/lua-resty-http/lua-resty-http.hash         | 3 ++-
 package/lua-sailor/lua-sailor.hash                 | 3 ++-
 package/lua-stdlib/lua-stdlib.hash                 | 3 ++-
 package/lua-testmore/lua-testmore.hash             | 5 +++--
 package/lua-utf8/lua-utf8.hash                     | 2 +-
 package/lua-valua/lua-valua.hash                   | 3 ++-
 package/luabitop/luabitop.hash                     | 4 ++--
 package/luacrypto/luacrypto.hash                   | 5 +++--
 package/luadbi-sqlite3/luadbi-sqlite3.hash         | 3 ++-
 package/luadbi/luadbi.hash                         | 3 ++-
 package/luaexpat/luaexpat.hash                     | 5 +++--
 package/luafilesystem/luafilesystem.hash           | 3 ++-
 package/luajson/luajson.hash                       | 3 ++-
 package/lualogging/lualogging.hash                 | 5 +++--
 package/luaossl/luaossl.hash                       | 3 ++-
 package/luasec/luasec.hash                         | 5 +++--
 package/luasocket/luasocket.hash                   | 5 +++--
 package/luasql-sqlite3/luasql-sqlite3.hash         | 5 +++--
 package/lunit/lunit.hash                           | 5 +++--
 package/orbit/orbit.hash                           | 2 +-
 package/rings/rings.hash                           | 5 +++--
 package/wsapi-fcgi/wsapi-fcgi.hash                 | 3 ++-
 package/wsapi-xavante/wsapi-xavante.hash           | 3 ++-
 package/wsapi/wsapi.hash                           | 5 +++--
 package/xavante/xavante.hash                       | 3 ++-
 52 files changed, 125 insertions(+), 79 deletions(-)

diff --git a/package/argparse/argparse.hash b/package/argparse/argparse.hash
index a4746bc6a..1192ca049 100644
--- a/package/argparse/argparse.hash
+++ b/package/argparse/argparse.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	e00e5637c937d7bfca96025f2c598ba4fffe9eb818d69952e77b4c08167a6be3  argparse-0.5.0-1.src.rock
+# computed by scanrock
+sha256 e00e5637c937d7bfca96025f2c598ba4fffe9eb818d69952e77b4c08167a6be3  argparse-0.5.0-1.src.rock
+sha256 88ecefab74d7b1bd603d6ab20760e0ac61015af1b00405ffca6fa649b9f8aeef  argparse/LICENSE
diff --git a/package/cgilua/cgilua.hash b/package/cgilua/cgilua.hash
index b932e80cb..41a1b94ac 100644
--- a/package/cgilua/cgilua.hash
+++ b/package/cgilua/cgilua.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 7d4883e6a89b3463a1d35b8084a6e2afbbb584af7aca1169380e92af0f848413  cgilua-5.2.1-1.src.rock
+sha256 0cf6f0858b0fd90bb5705c8ace77a8afd11e8fce1427fe0a48156937222b8c28  cgilua-5.2.1/doc/us/license.html
diff --git a/package/copas/copas.hash b/package/copas/copas.hash
index d894b8657..59922d415 100644
--- a/package/copas/copas.hash
+++ b/package/copas/copas.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 efeded4f4633bc71551175b239199304640ef918ae8ea9dc9c5047359ae07107  copas-2.0.2-1.src.rock
+sha256 3f59cccf38e9397f6fb34dcff983a24d336df982edb5b0cde549d0c32c28c9c0  copas-2_0_2/LICENSE
diff --git a/package/coxpcall/coxpcall.hash b/package/coxpcall/coxpcall.hash
index e037af9e8..b96d24a5d 100644
--- a/package/coxpcall/coxpcall.hash
+++ b/package/coxpcall/coxpcall.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 c1488ee08e5d25d59a11e19cb0322edae509202b246d0c93cb2de1676dbfdf2b  coxpcall-1.16.0-1.src.rock
+sha256 11f0f03dda1a28eca658d5e3361c15fd4d048371364aacc5f6870d77a66866c8  coxpcall/doc/license.html
diff --git a/package/dado/dado.hash b/package/dado/dado.hash
index 973bdb3ff..f905833bc 100644
--- a/package/dado/dado.hash
+++ b/package/dado/dado.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 5a10ed7ff7be34ac004d10d6ea62ee8efc2b594c50ffc93e840e7fb7a2e6b4d0  dado-1.8.3-1.src.rock
+sha256 141953aa7714e3145a6adfd71d6acbbe377e07ab920bc8ec4039394774da8a6e  dado-1.8.3/doc/license.html
diff --git a/package/ljlinenoise/ljlinenoise.hash b/package/ljlinenoise/ljlinenoise.hash
index c70b5d680..698725864 100644
--- a/package/ljlinenoise/ljlinenoise.hash
+++ b/package/ljlinenoise/ljlinenoise.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47  ljlinenoise-0.1.3-1.src.rock
+# computed by scanrock
+sha256 7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47  ljlinenoise-0.1.3-1.src.rock
+sha256 9b17730cb34ea591fb39688e70bd2be9c13d11b9db1c813b4ae68e3da9b7093e  ljlinenoise-0.1.3/COPYRIGHT
diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash
index 926167486..3f5a15cd2 100644
--- a/package/lpeg/lpeg.hash
+++ b/package/lpeg/lpeg.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d  lpeg-1.0.1-1.src.rock
+# computed by scanrock
+sha256 149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d  lpeg-1.0.1-1.src.rock
diff --git a/package/lpty/lpty.hash b/package/lpty/lpty.hash
index a451fd858..90d332fca 100644
--- a/package/lpty/lpty.hash
+++ b/package/lpty/lpty.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091  lpty-1.0.1-1.src.rock
+# computed by scanrock
+sha256 cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091  lpty-1.0.1-1.src.rock
+sha256 c5a128a73cad5f6e111ebd8f4a9fa3500562c57912972eb15627db9610d43dec  lpty-1.0.1-1/doc/LICENSE
diff --git a/package/lrandom/lrandom.hash b/package/lrandom/lrandom.hash
index 3f601330c..24da8b439 100644
--- a/package/lrandom/lrandom.hash
+++ b/package/lrandom/lrandom.hash
@@ -1,3 +1,3 @@
-# Locally calculated
-sha256	96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196  lrandom-20120430.51-1.src.rock
-sha256	480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454  lrandom-20120430.52-1.src.rock
+# computed by scanrock
+sha256 96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196  lrandom-20120430.51-1.src.rock
+sha256 480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454  lrandom-20120430.52-1.src.rock
diff --git a/package/lsqlite3/lsqlite3.hash b/package/lsqlite3/lsqlite3.hash
index 7cf0358d1..465ee8efc 100644
--- a/package/lsqlite3/lsqlite3.hash
+++ b/package/lsqlite3/lsqlite3.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	e6eb64a7ca3727c3093f3c37341d8ecadf9eac913e468eae413828476b19c225  lsqlite3-0.9.4-2.src.rock
+# computed by scanrock
+sha256 e6eb64a7ca3727c3093f3c37341d8ecadf9eac913e468eae413828476b19c225  lsqlite3-0.9.4-2.src.rock
diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash
index 91c428c14..5f1d79838 100644
--- a/package/lua-basexx/lua-basexx.hash
+++ b/package/lua-basexx/lua-basexx.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df  basexx-0.4.0-1.src.rock
+sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b  basexx-0.4.0/LICENSE
diff --git a/package/lua-bit32/lua-bit32.hash b/package/lua-bit32/lua-bit32.hash
index 21dbd0531..c6b3bdeb9 100644
--- a/package/lua-bit32/lua-bit32.hash
+++ b/package/lua-bit32/lua-bit32.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256  fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6  bit32-5.3.0-1.src.rock
+# computed by scanrock
+sha256 fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6  bit32-5.3.0-1.src.rock
+sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66  lua-compat-5.2/LICENSE
diff --git a/package/lua-cjson/lua-cjson.hash b/package/lua-cjson/lua-cjson.hash
index 852dc6781..82007ee8c 100644
--- a/package/lua-cjson/lua-cjson.hash
+++ b/package/lua-cjson/lua-cjson.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	db7af849c555d1a474f729fe4a56b5530e9be7b24749eb7a7c474a7c7207b972  lua-cjson-2.1.0-1.src.rock
+# computed by scanrock
+sha256 db7af849c555d1a474f729fe4a56b5530e9be7b24749eb7a7c474a7c7207b972  lua-cjson-2.1.0-1.src.rock
+sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e  lua-cjson-2.1.0/LICENSE
diff --git a/package/lua-coat/lua-coat.hash b/package/lua-coat/lua-coat.hash
index 1f2135566..aa55aaa0e 100644
--- a/package/lua-coat/lua-coat.hash
+++ b/package/lua-coat/lua-coat.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02  lua-coat-0.9.2-1.src.rock
+# computed by scanrock
+sha256 24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02  lua-coat-0.9.2-1.src.rock
+sha256 81b5f657812ccfd63f19c9af1389b5fe6b26f079a4841c5d074940c47bf7cb1e  lua-Coat-0.9.2/COPYRIGHT
diff --git a/package/lua-coatpersistent/lua-coatpersistent.hash b/package/lua-coatpersistent/lua-coatpersistent.hash
index eeb13bb1c..e117b3bfb 100644
--- a/package/lua-coatpersistent/lua-coatpersistent.hash
+++ b/package/lua-coatpersistent/lua-coatpersistent.hash
@@ -1,3 +1,4 @@
-# Locally calculated
-sha256	e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142  lua-coatpersistent-lsqlite3-0.2.2-1.src.rock
-sha256	5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6  lua-coatpersistent-luasql-0.2.2-1.src.rock
+# computed by scanrock
+sha256 e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142  lua-coatpersistent-lsqlite3-0.2.2-1.src.rock
+sha256 5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6  lua-coatpersistent-luasql-0.2.2-1.src.rock
+sha256 f8ed30644056ceff4315e694a1c1af4af4f08ec0adabae353ab8f3f5289ffbf3  lua-CoatPersistent-0.2.2/COPYRIGHT
diff --git a/package/lua-compat53/lua-compat53.hash b/package/lua-compat53/lua-compat53.hash
index 7f1e1bb22..e16948e0f 100644
--- a/package/lua-compat53/lua-compat53.hash
+++ b/package/lua-compat53/lua-compat53.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 fd0117156f59d1cb3824d5cca63be84c72cb5519b714377545433be3bb31afdf  compat53-0.5-1.src.rock
+sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5  lua-compat-5.3-0.5/LICENSE
diff --git a/package/lua-csnappy/lua-csnappy.hash b/package/lua-csnappy/lua-csnappy.hash
index f88742644..92d1c8df4 100644
--- a/package/lua-csnappy/lua-csnappy.hash
+++ b/package/lua-csnappy/lua-csnappy.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c  lua-csnappy-0.1.5-1.src.rock
+# computed by scanrock
+sha256 4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c  lua-csnappy-0.1.5-1.src.rock
+sha256 8865da757dbc6fe3c8cee4d88bdfd82c1e0e789974a4d0d52db75a985025c1f0  lua-csnappy-0.1.5/COPYRIGHT
diff --git a/package/lua-curl/lua-curl.hash b/package/lua-curl/lua-curl.hash
index e73810ced..c12fa3c06 100644
--- a/package/lua-curl/lua-curl.hash
+++ b/package/lua-curl/lua-curl.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 4cc6389bf5d4a868cc1e6017733b9b6306f2fc8b5083aa928d66399195697f34  lua-curl-0.3.7-1.src.rock
+sha256 3cc2f54f1d58008d16264ed6e560b6424283dda7f8f9155f777ffd496574b2ae  Lua-cURLv3-0.3.7/LICENSE
diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash
index 83c346eae..723c638cc 100644
--- a/package/lua-datafile/lua-datafile.hash
+++ b/package/lua-datafile/lua-datafile.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 37a33079c3476477f19de14bebd664635a39a57dd05a2709c3a402cbc1e79a6b  datafile-0.4-1.src.rock
+sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66  datafile/LICENSE
diff --git a/package/lua-fifo/lua-fifo.hash b/package/lua-fifo/lua-fifo.hash
index bab372804..5fe6afe44 100644
--- a/package/lua-fifo/lua-fifo.hash
+++ b/package/lua-fifo/lua-fifo.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 53dea24ad658614a0254dcb10296a1a0fc5357315ada5724d6362f54c32b4c20  fifo-0.2-0.src.rock
+sha256 8b4423dd4f55a69da1454b7a48346a54fd5b6e0408b38fde25cd29c0922962b6  fifo.lua-0.2/LICENSE
diff --git a/package/lua-flu/lua-flu.hash b/package/lua-flu/lua-flu.hash
index 92a0a13ff..c1f4bed84 100644
--- a/package/lua-flu/lua-flu.hash
+++ b/package/lua-flu/lua-flu.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53  flu-20150331-1.src.rock
+# computed by scanrock
+sha256 1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53  flu-20150331-1.src.rock
+sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913  doub-flu-a7daae986339/doc/LICENSE.txt
diff --git a/package/lua-http/lua-http.hash b/package/lua-http/lua-http.hash
index 2346ab97a..cfd11aa06 100644
--- a/package/lua-http/lua-http.hash
+++ b/package/lua-http/lua-http.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 d68591eeeeb60c4187469eae89f5bad02d753a8c0adaa460d453b0734222645a  http-0.2-0.src.rock
+sha256 10650e71ba335c76955bbbec2b1f5b9d5655f2e0fdc6c7cecae5bd28a376302c  lua-http-0.2/LICENSE.md
diff --git a/package/lua-iconv/lua-iconv.hash b/package/lua-iconv/lua-iconv.hash
index 46291026c..8a3b1f713 100644
--- a/package/lua-iconv/lua-iconv.hash
+++ b/package/lua-iconv/lua-iconv.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa  lua-iconv-7-1.src.rock
+# computed by scanrock
+sha256 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa  lua-iconv-7-1.src.rock
+sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4  lua-iconv-7/COPYING
diff --git a/package/lua-lpeg-patterns/lua-lpeg-patterns.hash b/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
index f779466df..faaaa4952 100644
--- a/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
+++ b/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 82c8eddee52069e5ae821b68cb9e295ab5767a47d07545a4ca36ac1e81066086  lpeg_patterns-0.4-0.src.rock
+sha256 5b0346f2b2432e5f05e8e4ad31503cf84ddf802dacde9e8c3e529efaa4be3348  lpeg_patterns-0.4/LICENSE.md
diff --git a/package/lua-markdown/lua-markdown.hash b/package/lua-markdown/lua-markdown.hash
index 9bfbf6007..c01fdaebf 100644
--- a/package/lua-markdown/lua-markdown.hash
+++ b/package/lua-markdown/lua-markdown.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07  markdown-0.33-1.src.rock
+sha256 c13c5634db49d16c87f164ce0b79fb7e1b313c8b66818ebf1c970747a429b39b  markdown/LICENSE
diff --git a/package/lua-messagepack/lua-messagepack.hash b/package/lua-messagepack/lua-messagepack.hash
index 86ea5d088..59a3a35d5 100644
--- a/package/lua-messagepack/lua-messagepack.hash
+++ b/package/lua-messagepack/lua-messagepack.hash
@@ -1,3 +1,4 @@
-# Locally calculated
+# computed by scanrock
 sha256 a27d985b8bdb79ebe78dfe255c795e839a04eb2fed1c610a81c7876e3f72fd97  lua-messagepack-0.5.1-1.src.rock
 sha256 b7f69ada6aed7e0cdfd690291607d8f41246e67f191107ecdc0a1e592c449abe  lua-messagepack-lua53-0.5.1-1.src.rock
+sha256 e409ff1f089c1cd36840349fd790a6ffce5a31f16d30c108ce94aaa3b128dcea  lua-MessagePack-0.5.1/COPYRIGHT
diff --git a/package/lua-periphery/lua-periphery.hash b/package/lua-periphery/lua-periphery.hash
index 7f6e63f3b..8b81e1fae 100644
--- a/package/lua-periphery/lua-periphery.hash
+++ b/package/lua-periphery/lua-periphery.hash
@@ -1,2 +1,3 @@
-# Locally computed
-sha256  53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab  lua-periphery-1.0.6-1.src.rock
+# computed by scanrock
+sha256 53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab  lua-periphery-1.0.6-1.src.rock
+sha256 7c60847b46f718e9651d1eca2f56bf6be09608cf08d130446a521eb8288c98e1  lua-periphery/LICENSE
diff --git a/package/lua-resty-http/lua-resty-http.hash b/package/lua-resty-http/lua-resty-http.hash
index e45df0e91..b3efed014 100644
--- a/package/lua-resty-http/lua-resty-http.hash
+++ b/package/lua-resty-http/lua-resty-http.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 4628413a5a2828645e3ddb38a2a0c764e81443cbd1a011357eeed7e983750329  lua-resty-http-0.12-0.src.rock
+sha256 407e4b1412d8afa317dc703a1d318866c3de87d78899402125cbd90548c6057d  lua-resty-http/LICENSE
diff --git a/package/lua-sailor/lua-sailor.hash b/package/lua-sailor/lua-sailor.hash
index f4c42cccc..a036a6c45 100644
--- a/package/lua-sailor/lua-sailor.hash
+++ b/package/lua-sailor/lua-sailor.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf  sailor-0.5-4.src.rock
+sha256 3a19bc44e1a653b39bcb1b91cc8058ac6b1cd1caf7e6cef93517fd559b189065  sailor/LICENSE
diff --git a/package/lua-stdlib/lua-stdlib.hash b/package/lua-stdlib/lua-stdlib.hash
index 4882bf1e7..ff7073bcd 100644
--- a/package/lua-stdlib/lua-stdlib.hash
+++ b/package/lua-stdlib/lua-stdlib.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 b7302ecc8ea3992d3bad96c0c4d56272e38d786d16cc1ad5964fefa73fd7c10b  stdlib-41.2.1-1.src.rock
+sha256 d3177e0cd97e6ef7c459aa2c6a85f53d9b4ff091f7f296d4ed8bfaf713b6fea2  lua-stdlib-release-v41.2.1/COPYING
diff --git a/package/lua-testmore/lua-testmore.hash b/package/lua-testmore/lua-testmore.hash
index 8db664f2d..f7b839b9e 100644
--- a/package/lua-testmore/lua-testmore.hash
+++ b/package/lua-testmore/lua-testmore.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2  lua-testmore-0.3.3-1.src.rock
+# computed by scanrock
+sha256 163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2  lua-testmore-0.3.3-1.src.rock
+sha256 0fa63370a149eda33e25987dd63bd096a616a3e47d2cfc45ca2fd66e8d2bfb35  lua-TestMore-0.3.3/COPYRIGHT
diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash
index 51fa2439f..002e63385 100644
--- a/package/lua-utf8/lua-utf8.hash
+++ b/package/lua-utf8/lua-utf8.hash
@@ -1,2 +1,2 @@
-# Locally calculated
+# computed by scanrock
 sha256 c9ceb3a9f327b3215cdf959eebf616970b5b0427ca3fde05b19f8236defa4b91  utf8-1.2-0.src.rock
diff --git a/package/lua-valua/lua-valua.hash b/package/lua-valua/lua-valua.hash
index 92ea61311..a19f5a5fe 100644
--- a/package/lua-valua/lua-valua.hash
+++ b/package/lua-valua/lua-valua.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3  valua-0.3-1.src.rock
+sha256 3444c2e739c88e41e327c6cd15e4a50fea8988570642bad6e6a43d50a7f7961f  valua/LICENSE
diff --git a/package/luabitop/luabitop.hash b/package/luabitop/luabitop.hash
index 78110205a..4d530bb3c 100644
--- a/package/luabitop/luabitop.hash
+++ b/package/luabitop/luabitop.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e  luabitop-1.0.2-1.src.rock
+# computed by scanrock
+sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e  luabitop-1.0.2-1.src.rock
diff --git a/package/luacrypto/luacrypto.hash b/package/luacrypto/luacrypto.hash
index 5c577672e..5dd713611 100644
--- a/package/luacrypto/luacrypto.hash
+++ b/package/luacrypto/luacrypto.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	dc935c923b8851208d5d504b343448a9d5bd3e537bb8657875f12d72155600b8  luacrypto-0.3.2-1.src.rock
+# computed by scanrock
+sha256 dc935c923b8851208d5d504b343448a9d5bd3e537bb8657875f12d72155600b8  luacrypto-0.3.2-1.src.rock
+sha256 f97651bcb248dff32f121ef7a904617b9252d80f4b911e4476806c512a268fa9  luacrypto-0.3.2/COPYING
diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.hash b/package/luadbi-sqlite3/luadbi-sqlite3.hash
index bd8b927fa..4c77283a3 100644
--- a/package/luadbi-sqlite3/luadbi-sqlite3.hash
+++ b/package/luadbi-sqlite3/luadbi-sqlite3.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 2868dad4d189368fcf5cddd191965c8cb2efaa3a3ba83d50e6a88c30353f74ce  luadbi-sqlite3-0.6-2.src.rock
+sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928  luadbi/COPYING
diff --git a/package/luadbi/luadbi.hash b/package/luadbi/luadbi.hash
index e5c022bdf..ead82d437 100644
--- a/package/luadbi/luadbi.hash
+++ b/package/luadbi/luadbi.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 723f63b744b7367ddfd6bbf7a7e6f6867aa1eaabbbc2bab5dc8a90e80b0c34c2  luadbi-0.6-2.src.rock
+sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928  luadbi/COPYING
diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash
index 27f6ed034..ffa373dcd 100644
--- a/package/luaexpat/luaexpat.hash
+++ b/package/luaexpat/luaexpat.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	aa7883a0d44f500e32ef306c04632546f97f33159fffa7bcdc3f451170f95896  luaexpat-1.3.0-1.src.rock
+# computed by scanrock
+sha256 aa7883a0d44f500e32ef306c04632546f97f33159fffa7bcdc3f451170f95896  luaexpat-1.3.0-1.src.rock
+sha256 c0dd2263f9044685b3d89d0f2b208fb60d9d141f5bd80a280beefa53e373a42f  luaexpat-1.3.0/doc/us/license.html
diff --git a/package/luafilesystem/luafilesystem.hash b/package/luafilesystem/luafilesystem.hash
index bd4a446cf..19f2e47ae 100644
--- a/package/luafilesystem/luafilesystem.hash
+++ b/package/luafilesystem/luafilesystem.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 65e6d437e577a1d6cd509b6cd224d2cb9501d58d32a72cafbd4fd3f911681576  luafilesystem-1.7.0-2.src.rock
+sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842  luafilesystem/LICENSE
diff --git a/package/luajson/luajson.hash b/package/luajson/luajson.hash
index 36534fe34..ba26ce6a1 100644
--- a/package/luajson/luajson.hash
+++ b/package/luajson/luajson.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 28a5928cf2e4fd79fa9a9aceaef5ebf1dccb1146489b7de4c2726f561700f01c  luajson-1.3.4-1.src.rock
+sha256 87565fca189b70f2e119b2a99e5e92a7aaab9f2eb05228b56b88e6c2e2f98bcd  luajson/LICENSE
diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash
index 8a6211ec3..a17f086a0 100644
--- a/package/lualogging/lualogging.hash
+++ b/package/lualogging/lualogging.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d  lualogging-1.3.0-1.src.rock
+# computed by scanrock
+sha256 6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d  lualogging-1.3.0-1.src.rock
+sha256 4e86086c032a006ce1289565cc9d9afff26b5117891cd26ffa15aa866bd28ee5  lualogging/COPYRIGHT
diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash
index 8c91a1fcf..2f27a5104 100644
--- a/package/luaossl/luaossl.hash
+++ b/package/luaossl/luaossl.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 f9c94c97579efddf8abad1e373e0fe0ecc93d00cd9d1bd49f48c5716c281a08b  luaossl-20171028-0.src.rock
+sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219  luaossl-rel-20171028/LICENSE
diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash
index 1fdbe7d7e..f2ff959cd 100644
--- a/package/luasec/luasec.hash
+++ b/package/luasec/luasec.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a  luasec-0.7-1.src.rock
+# computed by scanrock
+sha256 383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a  luasec-0.7-1.src.rock
+sha256 b310a4c5a9927a43123e3ffcfaa5f5921b545b64d38ea55c7faf2a837547a200  luasec-luasec-0.7/LICENSE
diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash
index ad91f4420..54573dca6 100644
--- a/package/luasocket/luasocket.hash
+++ b/package/luasocket/luasocket.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a  luasocket-3.0rc1-1.src.rock
+# computed by scanrock
+sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a  luasocket-3.0rc1-1.src.rock
+sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad  luasocket-3.0-rc1/LICENSE
diff --git a/package/luasql-sqlite3/luasql-sqlite3.hash b/package/luasql-sqlite3/luasql-sqlite3.hash
index 5728c8db0..852ef796c 100644
--- a/package/luasql-sqlite3/luasql-sqlite3.hash
+++ b/package/luasql-sqlite3/luasql-sqlite3.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	e98d4e997682097f5bc2859596b9615f4cb87438db23ceb4af5e36b4424524ab  luasql-sqlite3-2.3.0-1.src.rock
+# computed by scanrock
+sha256 e98d4e997682097f5bc2859596b9615f4cb87438db23ceb4af5e36b4424524ab  luasql-sqlite3-2.3.0-1.src.rock
+sha256 e38362f9533fa0325f0f1e2ec6284c386cad6d8b5f2e548d20b4a3af31e7b5da  luasql/doc/us/license.html
diff --git a/package/lunit/lunit.hash b/package/lunit/lunit.hash
index 9c8d53c5e..021d9f297 100644
--- a/package/lunit/lunit.hash
+++ b/package/lunit/lunit.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d  lunit-0.5-2.src.rock
+# computed by scanrock
+sha256 b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d  lunit-0.5-2.src.rock
+sha256 316317e9e9b7eac811e1be56738e2434fb4a0c39ecd660f3b34dad739bfb3707  lunit-0.5/LICENSE
diff --git a/package/orbit/orbit.hash b/package/orbit/orbit.hash
index 9662a650a..b9a38e999 100644
--- a/package/orbit/orbit.hash
+++ b/package/orbit/orbit.hash
@@ -1,2 +1,2 @@
-# Locally calculated
+# computed by scanrock
 sha256 91e3c514d5b86918db83666c8889635bb2d50c71d1ab3aeb69c6469c9424089b  orbit-2.2.4-1.src.rock
diff --git a/package/rings/rings.hash b/package/rings/rings.hash
index 59da2fa32..0ed577821 100644
--- a/package/rings/rings.hash
+++ b/package/rings/rings.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3  rings-1.3.0-1.src.rock
+# computed by scanrock
+sha256 627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3  rings-1.3.0-1.src.rock
+sha256 f582a0c43737391070827ef273df0145b594b095ad2f49595701368b729e024f  rings-v_1_3_0/doc/us/license.html
diff --git a/package/wsapi-fcgi/wsapi-fcgi.hash b/package/wsapi-fcgi/wsapi-fcgi.hash
index f82ce9cfc..374ae7dfa 100644
--- a/package/wsapi-fcgi/wsapi-fcgi.hash
+++ b/package/wsapi-fcgi/wsapi-fcgi.hash
@@ -1,2 +1,3 @@
-# locally computed hash
+# computed by scanrock
 sha256 73dc200889bc185953cd3a7c5350c998c090f901fcd10771273b7a63a3ffcdcf  wsapi-fcgi-1.6.1-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi-1.6.1/doc/us/license.html
diff --git a/package/wsapi-xavante/wsapi-xavante.hash b/package/wsapi-xavante/wsapi-xavante.hash
index 9e8132df5..c08630f3b 100644
--- a/package/wsapi-xavante/wsapi-xavante.hash
+++ b/package/wsapi-xavante/wsapi-xavante.hash
@@ -1,2 +1,3 @@
-# locally computed hash
+# computed by scanrock
 sha256 b30b171e3d4d6fd7e129f14576e1cfc5adf00c0780ef8350f2f9e6f1d4259346  wsapi-xavante-1.6.1-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi-1.6.1/doc/us/license.html
diff --git a/package/wsapi/wsapi.hash b/package/wsapi/wsapi.hash
index 3abbfc979..7ae9ae3bb 100644
--- a/package/wsapi/wsapi.hash
+++ b/package/wsapi/wsapi.hash
@@ -1,2 +1,3 @@
-# locally computed hash
-sha256 f7f1b0ddc68c257965c42ac7155904d8ff7c2b7256f65ef1b82fda0039137d61 wsapi-1.6.1-1.src.rock
+# computed by scanrock
+sha256 f7f1b0ddc68c257965c42ac7155904d8ff7c2b7256f65ef1b82fda0039137d61  wsapi-1.6.1-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi-1.6.1/doc/us/license.html
diff --git a/package/xavante/xavante.hash b/package/xavante/xavante.hash
index 09b2a22d4..c4b623258 100644
--- a/package/xavante/xavante.hash
+++ b/package/xavante/xavante.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by scanrock
 sha256 67c738f981e7d65d18c717f3acac59a37f95d5139c00fb0de5d3167262025273  xavante-2.4.0-1.src.rock
+sha256 57b2c50f08bf500c969fe13500f217adb36582e4d8e75c9e2ed04191cb4a045c  xavante-2.4.0/doc/us/license.html
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files
  2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
  2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
  2018-10-21 16:32 ` [Buildroot] [scanrock 2/5] lua*: regeneration of hash files Francois Perrad
@ 2018-10-21 16:32 ` Francois Perrad
  2018-10-23 22:56   ` Arnout Vandecappelle
  2018-10-21 16:32 ` [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in Francois Perrad
  2018-10-21 16:32 ` [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target Francois Perrad
  4 siblings, 1 reply; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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-iconv/lua-iconv.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                   | 3 +--
 package/wsapi-fcgi/wsapi-fcgi.mk         | 8 ++++----
 package/wsapi-xavante/wsapi-xavante.mk   | 6 +++---
 16 files changed, 23 insertions(+), 27 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-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk
index dd7533af5..ea8e0dd8b 100644
--- a/package/lua-iconv/lua-iconv.mk
+++ b/package/lua-iconv/lua-iconv.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUA_ICONV_VERSION = 7-1
-LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LUA_ICONV_LICENSE = MIT
 LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING
+LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(luarocks-package))
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..f3db1cec1 100644
--- a/package/orbit/orbit.mk
+++ b/package/orbit/orbit.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-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
diff --git a/package/wsapi-fcgi/wsapi-fcgi.mk b/package/wsapi-fcgi/wsapi-fcgi.mk
index 2b0e6b255..2c99b7073 100644
--- a/package/wsapi-fcgi/wsapi-fcgi.mk
+++ b/package/wsapi-fcgi/wsapi-fcgi.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-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_DEPENDENCIES = libfcgi
 
 $(eval $(luarocks-package))
diff --git a/package/wsapi-xavante/wsapi-xavante.mk b/package/wsapi-xavante/wsapi-xavante.mk
index 86f5dee50..5c7709538 100644
--- a/package/wsapi-xavante/wsapi-xavante.mk
+++ b/package/wsapi-xavante/wsapi-xavante.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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
 
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in
  2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
                   ` (2 preceding siblings ...)
  2018-10-21 16:32 ` [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files Francois Perrad
@ 2018-10-21 16:32 ` Francois Perrad
  2018-10-23 23:02   ` Arnout Vandecappelle
  2018-10-21 16:32 ` [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target Francois Perrad
  4 siblings, 1 reply; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/argparse/Config.in           |  6 +-----
 package/cgilua/Config.in             |  7 +++----
 package/copas/Config.in              | 12 ++++--------
 package/coxpcall/Config.in           |  6 ++----
 package/dado/Config.in               |  4 ++--
 package/ljlinenoise/Config.in        |  7 ++-----
 package/ljsyscall/Config.in          |  6 ++----
 package/lpeg/Config.in               |  6 ++----
 package/lpty/Config.in               |  4 +---
 package/lrandom/Config.in            |  4 +---
 package/lsqlite3/Config.in           |  3 +--
 package/lua-basexx/Config.in         |  4 +---
 package/lua-bit32/Config.in          |  4 +---
 package/lua-cjson/Config.in          | 12 +-----------
 package/lua-coatpersistent/Config.in |  7 +++----
 package/lua-csnappy/Config.in        |  3 +--
 package/lua-curl/Config.in           |  4 ++--
 package/lua-datafile/Config.in       |  5 ++---
 package/lua-fifo/Config.in           |  2 +-
 package/lua-flu/Config.in            |  5 +----
 package/lua-http/Config.in           | 16 ++++++++--------
 package/lua-iconv/Config.in          |  4 ++--
 package/lua-lpeg-patterns/Config.in  |  5 ++---
 package/lua-markdown/Config.in       |  3 +--
 package/lua-messagepack/Config.in    |  4 ++--
 package/lua-periphery/Config.in      |  4 +---
 package/lua-resty-http/Config.in     |  2 +-
 package/lua-sailor/Config.in         | 20 +++++++++-----------
 package/lua-sdl2/Config.in           |  6 +++---
 package/lua-stdlib/Config.in         |  7 ++-----
 package/lua-testmore/Config.in       |  2 +-
 package/lua-utf8/Config.in           |  3 +--
 package/lua-valua/Config.in          |  5 +----
 package/luabitop/Config.in           |  5 ++---
 package/luacrypto/Config.in          |  8 ++------
 package/luadbi-sqlite3/Config.in     |  5 ++---
 package/luadbi/Config.in             |  6 +-----
 package/luaexpat/Config.in           |  5 ++---
 package/luafilesystem/Config.in      |  4 +---
 package/luajson/Config.in            |  6 ++----
 package/lualogging/Config.in         |  7 ++-----
 package/luaossl/Config.in            |  9 +--------
 package/luaposix/Config.in           | 10 +++-------
 package/luasec/Config.in             |  7 +++----
 package/luasocket/Config.in          |  6 +-----
 package/luasql-sqlite3/Config.in     |  5 ++---
 package/lunit/Config.in              |  2 +-
 package/orbit/Config.in              | 12 +++++-------
 package/rings/Config.in              |  5 ++---
 package/wsapi-fcgi/Config.in         | 11 +++++------
 package/wsapi-xavante/Config.in      | 15 ++++++---------
 package/wsapi/Config.in              |  9 +++------
 package/xavante/Config.in            | 15 +++++----------
 53 files changed, 119 insertions(+), 225 deletions(-)

diff --git a/package/argparse/Config.in b/package/argparse/Config.in
index d207b0482..f8e71a0cd 100644
--- a/package/argparse/Config.in
+++ b/package/argparse/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_ARGPARSE
 	bool "argparse"
 	help
-	  Argparse is a feature-rich command line parser for Lua
-	  inspired by argparse for Python. Argparse supports
-	  positional arguments, options, flags, optional arguments,
-	  subcommands and more. Argparse automatically generates
-	  usage, help and error messages.
+	  A feature-rich command-line argument parser
 
 	  https://github.com/mpeterv/argparse
diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in
index d1e7fbf0e..65c0ad934 100644
--- a/package/cgilua/Config.in
+++ b/package/cgilua/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_CGILUA
 	bool "cgilua"
-	# Runtime dependency only
-	select BR2_PACKAGE_LUAFILESYSTEM
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
 	help
-	  CGILua is a tool for creating dynamic HTML pages
-	  and manipulating input data from Web forms.
+	  Tool for creating dynamic Web pages and manipulating data from
+	  Web forms
 
 	  http://keplerproject.github.com/cgilua
diff --git a/package/copas/Config.in b/package/copas/Config.in
index d7800b6dd..e093c9e0c 100644
--- a/package/copas/Config.in
+++ b/package/copas/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_COPAS
 	bool "copas"
-	# Runtime dependency only
-	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
-	  Copas is a dispatcher based on coroutines that can be used
-	  for asynchronous networking. For example TCP or UDP based
-	  servers. But it also features timers and client support for
-	  http(s), ftp and smtp requests.
+	  Coroutine Oriented Portable Asynchronous Services
 
-	  http://keplerproject.github.com/copas/
+	  http://www.keplerproject.org/copas/
diff --git a/package/coxpcall/Config.in b/package/coxpcall/Config.in
index 373501795..9cea8a097 100644
--- a/package/coxpcall/Config.in
+++ b/package/coxpcall/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_COXPCALL
 	bool "coxpcall"
 	help
-	  Coxpcall encapsulates the protected calls with a coroutine
-	  based loop, so errors can be handled without the usual
-	  pcall/xpcall issues with coroutines for Lua 5.1.
+	  Coroutine safe xpcall and pcall
 
-	  http://keplerproject.github.io/coxpcall/
+	  http://keplerproject.github.io/coxpcall
diff --git a/package/dado/Config.in b/package/dado/Config.in
index fb469f40e..7f9870a61 100644
--- a/package/dado/Config.in
+++ b/package/dado/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DADO
 	bool "dado"
 	help
-	  Database Facilities for LuaSQL.
+	  Database Facilities for LuaSQL
 
-	  http://www.ccpa.puc-rio.br/software/dado/
+	  http://www.ccpa.puc-rio.br/software/dado
diff --git a/package/ljlinenoise/Config.in b/package/ljlinenoise/Config.in
index e6b587e65..f3c1e2f90 100644
--- a/package/ljlinenoise/Config.in
+++ b/package/ljlinenoise/Config.in
@@ -1,12 +1,9 @@
 config BR2_PACKAGE_LJLINENOISE
 	bool "ljlinenoise"
-	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
-	# run-time dependency only
-	select BR2_PACKAGE_LJSYSCALL
+	select BR2_PACKAGE_LJSYSCALL # runtime
 	help
-	  ljlinenoise is a pure LuaJIT port of linenoise,
-	  a small alternative to readline and libedit.
+	  Line editing in pure LuaJIT
 
 	  https://fperrad.frama.io/ljlinenoise/
 
diff --git a/package/ljsyscall/Config.in b/package/ljsyscall/Config.in
index 3af9dabe9..d335018ee 100644
--- a/package/ljsyscall/Config.in
+++ b/package/ljsyscall/Config.in
@@ -1,12 +1,10 @@
 config BR2_PACKAGE_LJSYSCALL
 	bool "ljsyscall"
-	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	help
-	  An FFI implementation of the Linux and NetBSD kernel ABIs for
-	  LuaJIT.
+	  LuaJIT Linux syscall FFI
 
-	  http://github.com/justincormack/ljsyscall
+	  http://www.myriabit.com/ljsyscall/
 
 comment "ljsyscall needs LuaJIT"
 	depends on !BR2_PACKAGE_LUAJIT
diff --git a/package/lpeg/Config.in b/package/lpeg/Config.in
index 957991d41..d1ab5001f 100644
--- a/package/lpeg/Config.in
+++ b/package/lpeg/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LPEG
 	bool "lpeg"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  LPeg is a new pattern-matching library for Lua,
-	  based on Parsing Expression Grammars (PEGs).
+	  Parsing Expression Grammars For Lua
 
-	  http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
+	  http://www.inf.puc-rio.br/~roberto/lpeg.html
diff --git a/package/lpty/Config.in b/package/lpty/Config.in
index 50cbd2548..a87318183 100644
--- a/package/lpty/Config.in
+++ b/package/lpty/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LPTY
 	bool "lpty"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  A simple facility for lua to control other programs via
-	  PTYs.
+	  A simple facility for lua to control other programs via PTYs.
 
 	  http://www.tset.de/lpty/
diff --git a/package/lrandom/Config.in b/package/lrandom/Config.in
index 64bcf0ce0..720c1a9fc 100644
--- a/package/lrandom/Config.in
+++ b/package/lrandom/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LRANDOM
 	bool "lrandom"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  A library for generating random numbers
-	  based on the Mersenne Twister
+	  A library for generating random numbers.
 
 	  http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lrandom
diff --git a/package/lsqlite3/Config.in b/package/lsqlite3/Config.in
index 223fb59c9..57ec407b3 100644
--- a/package/lsqlite3/Config.in
+++ b/package/lsqlite3/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LSQLITE3
 	bool "lsqlite3"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_SQLITE
 	help
-	  a thin Lua wrapper for the SQLite3 library.
+	  A binding for Lua to the SQLite3 database library
 
 	  http://lua.sqlite.org/
diff --git a/package/lua-basexx/Config.in b/package/lua-basexx/Config.in
index 2f3bb1dec..06a789a1d 100644
--- a/package/lua-basexx/Config.in
+++ b/package/lua-basexx/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LUA_BASEXX
 	bool "lua-basexx"
 	help
-	  A Lua library which provides base2(bitfield), base16(hex),
-	  base32(crockford/rfc), base64(rfc/url), base85(z85) decoding
-	  and encoding.
+	  A base2, base16, base32, base64 and base85 library for Lua
 
 	  https://github.com/aiq/basexx
diff --git a/package/lua-bit32/Config.in b/package/lua-bit32/Config.in
index f896940de..e0316ef8a 100644
--- a/package/lua-bit32/Config.in
+++ b/package/lua-bit32/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LUA_BIT32
 	bool "lua-bit32"
 	help
-	  bit32 is the native Lua 5.2 bit manipulation library, in the
-	  version from Lua 5.3; it is compatible with Lua 5.1, 5.2 and
-	  5.3.
+	  Lua 5.2 bit manipulation library
 
 	  http://www.lua.org/manual/5.2/manual.html#6.7
diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in
index 262452a82..dac3cee6a 100644
--- a/package/lua-cjson/Config.in
+++ b/package/lua-cjson/Config.in
@@ -1,16 +1,6 @@
 config BR2_PACKAGE_LUA_CJSON
 	bool "lua-cjson"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  The Lua CJSON module provides JSON support for Lua.
-	  It features:
-	  - Fast, standards compliant encoding/parsing routines
-	  - Full support for JSON with UTF-8, including decoding
-	    surrogate pairs
-	  - Optional run-time support for common exceptions to the JSON
-	    specification (infinity, NaN, ...)
-	  - No dependencies on other libraries
-
-	  (C-module)
+	  A fast JSON encoding/parsing module
 
 	  http://www.kyne.com.au/~mark/software/lua-cjson.php
diff --git a/package/lua-coatpersistent/Config.in b/package/lua-coatpersistent/Config.in
index 049a0bc2a..216f34570 100644
--- a/package/lua-coatpersistent/Config.in
+++ b/package/lua-coatpersistent/Config.in
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_LUA_COATPERSISTENT
 	bool "lua-coatpersistent"
 	depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3
-	# run-time dependencies
-	select BR2_PACKAGE_DADO
-	select BR2_PACKAGE_LUA_COAT
+	select BR2_PACKAGE_DADO # runtime
+	select BR2_PACKAGE_LUA_COAT # runtime
 	help
-	  An ORM for lua-Coat.
+	  an ORM for lua-Coat
 
 	  https://fperrad.frama.io/lua-CoatPersistent/
 
diff --git a/package/lua-csnappy/Config.in b/package/lua-csnappy/Config.in
index fb00a1300..f018b8569 100644
--- a/package/lua-csnappy/Config.in
+++ b/package/lua-csnappy/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_CSNAPPY
 	bool "lua-csnappy"
 	help
-	  lua-csnappy is a binding of the csnappy library
-	  which implements the Google's Snappy (de)compressor.
+	  a fast compressor/decompressor
 
 	  https://fperrad.frama.io/lua-csnappy/
diff --git a/package/lua-curl/Config.in b/package/lua-curl/Config.in
index 88cdaf10c..fd4f3261d 100644
--- a/package/lua-curl/Config.in
+++ b/package/lua-curl/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_LUA_CURL
 	bool "lua-curl"
 	select BR2_PACKAGE_LIBCURL
 	help
-	  Lua binding to libcurl.
+	  Lua binding to libcurl
 
-	  https://lua-curl.github.io/
+	  https://github.com/Lua-cURL
diff --git a/package/lua-datafile/Config.in b/package/lua-datafile/Config.in
index e65406ed8..9eb489390 100644
--- a/package/lua-datafile/Config.in
+++ b/package/lua-datafile/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_DATAFILE
 	bool "lua-datafile"
 	help
-	  datafile is a library for avoiding hardcoded paths
-	  when loading resource files in Lua modules.
+	  A library for handling paths when loading data files
 
-	  https://github.com/hishamhm/datafile
+	  http://github.com/hishamhm/datafile
diff --git a/package/lua-fifo/Config.in b/package/lua-fifo/Config.in
index 5715b6bd2..097a2de55 100644
--- a/package/lua-fifo/Config.in
+++ b/package/lua-fifo/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_FIFO
 	bool "lua-fifo"
 	help
-	  A lua library/'class' that implements a FIFO.
+	  A lua library/'class' that implements a FIFO
 
 	  https://github.com/daurnimator/fifo.lua
diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in
index 526dc9008..8c2e061ec 100644
--- a/package/lua-flu/Config.in
+++ b/package/lua-flu/Config.in
@@ -6,10 +6,7 @@ config BR2_PACKAGE_LUA_FLU
 	select BR2_PACKAGE_ATTR
 	select BR2_PACKAGE_LIBFUSE
 	help
-	  Flu is a Lua binding for FUSE, which is a library allowing
-	  creation of filesystem drivers run in userspace. Flu is a high
-	  level binding, using basic Lua types rather than userdata
-	  whenever possible.
+	  Filesystems in Lua Userspace.
 
 	  http://piratery.net/flu/
 
diff --git a/package/lua-http/Config.in b/package/lua-http/Config.in
index 247cc4031..561e0677b 100644
--- a/package/lua-http/Config.in
+++ b/package/lua-http/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_LUA_HTTP
 	bool "lua-http"
 	depends on BR2_TOOLCHAIN_HAS_THREADS    # luaossl & lua-cqueues
-	# These are runtime dependencies
-	select BR2_PACKAGE_LUA_BASEXX
-	select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3
-	select BR2_PACKAGE_LUA_CQUEUES
-	select BR2_PACKAGE_LUA_FIFO
-	select BR2_PACKAGE_LUA_LPEG_PATTERNS
-	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
-	select BR2_PACKAGE_LUAOSSL
+	select BR2_PACKAGE_LPEG # runtime
+	select BR2_PACKAGE_LUA_BASEXX # runtime
+	select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime
+	select BR2_PACKAGE_LUA_CQUEUES # runtime
+	select BR2_PACKAGE_LUA_FIFO # runtime
+	select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime
+	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime
+	select BR2_PACKAGE_LUAOSSL # runtime
 	help
 	  HTTP library for Lua
 
diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in
index e76019d67..de85e2fee 100644
--- a/package/lua-iconv/Config.in
+++ b/package/lua-iconv/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_LUA_ICONV
 	bool "lua-iconv"
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-	  Lua binding to the POSIX 'iconv' library
+	  Lua binding to the iconv
 
-	  http://ittner.github.io/lua-iconv/
+	  http://ittner.github.com/lua-iconv/
diff --git a/package/lua-lpeg-patterns/Config.in b/package/lua-lpeg-patterns/Config.in
index 9c701d3de..741ca5d98 100644
--- a/package/lua-lpeg-patterns/Config.in
+++ b/package/lua-lpeg-patterns/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LUA_LPEG_PATTERNS
 	bool "lua-lpeg-patterns"
-	# These are runtime dependencies
-	select BR2_PACKAGE_LPEG
+	select BR2_PACKAGE_LPEG # runtime
 	help
-	  a collection of LPEG patterns.
+	  a collection of LPEG patterns
 
 	  https://github.com/daurnimator/lpeg_patterns
diff --git a/package/lua-markdown/Config.in b/package/lua-markdown/Config.in
index c53dc4606..dff35aa50 100644
--- a/package/lua-markdown/Config.in
+++ b/package/lua-markdown/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_MARKDOWN
 	bool "lua-markdown"
 	help
-	  A pure-lua implementation of the Markdown text-to-html
-	  markup system.
+	  Markdown text-to-html markup system.
 
 	  https://github.com/mpeterv/markdown
diff --git a/package/lua-messagepack/Config.in b/package/lua-messagepack/Config.in
index 7ec098f9a..69ec2f985 100644
--- a/package/lua-messagepack/Config.in
+++ b/package/lua-messagepack/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LUA_MESSAGEPACK
 	bool "lua-messagepack"
 	help
-	  A pure Lua implementation of the MessagePack serialization
-	  format.
+	  a pure Lua implementation of the MessagePack serialization
+	  format
 
 	  https://fperrad.frama.io/lua-MessagePack/
diff --git a/package/lua-periphery/Config.in b/package/lua-periphery/Config.in
index de5a71633..e8f422fc5 100644
--- a/package/lua-periphery/Config.in
+++ b/package/lua-periphery/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LUA_PERIPHERY
 	bool "lua-periphery"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O
-	  interface access in userspace Linux with Lua.
+	  Linux Peripheral I/O (GPIO, SPI, I2C, MMIO, Serial) with Lua
 
 	  https://github.com/vsergeev/lua-periphery
diff --git a/package/lua-resty-http/Config.in b/package/lua-resty-http/Config.in
index 4697c90df..9e39a8105 100644
--- a/package/lua-resty-http/Config.in
+++ b/package/lua-resty-http/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_LUA_RESTY_HTTP
 	help
 	  Lua HTTP client cosocket driver for OpenResty / ngx_lua.
 
-	  http://github.com/pintsized/lua-resty-http
+	  https://github.com/pintsized/lua-resty-http
diff --git a/package/lua-sailor/Config.in b/package/lua-sailor/Config.in
index 2600d4600..822fe56db 100644
--- a/package/lua-sailor/Config.in
+++ b/package/lua-sailor/Config.in
@@ -1,15 +1,13 @@
 config BR2_PACKAGE_LUA_SAILOR
 	bool "lua-sailor"
-	# These are runtime dependencies
-	select BR2_PACKAGE_CGILUA
-	select BR2_PACKAGE_LBASE64
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_LUA_DATAFILE
-	select BR2_PACKAGE_LUA_VALUA
-	select BR2_PACKAGE_XAVANTE
-	select BR2_PACKAGE_WSAPI_XAVANTE
+	select BR2_PACKAGE_CGILUA # runtime
+	select BR2_PACKAGE_LBASE64 # runtime
+	select BR2_PACKAGE_LUA_DATAFILE # runtime
+	select BR2_PACKAGE_LUA_VALUA # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_WSAPI_XAVANTE # runtime
+	select BR2_PACKAGE_XAVANTE # runtime
 	help
-	  Sailor is a web framework written in Lua that follows the MVC
-	  design pattern.
+	  A Lua MVC Framework
 
-	  http://sailorproject.org/
+	  http://sailorproject.org
diff --git a/package/lua-sdl2/Config.in b/package/lua-sdl2/Config.in
index 65f9e7ff4..7ab051310 100644
--- a/package/lua-sdl2/Config.in
+++ b/package/lua-sdl2/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_LUA_SDL2
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_SDL2
 	help
-	  Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2,
-	  Lua 5.3, and LuaJIT.
+	  Lua-SDL2 is a pure C binding of SDL 2.0 for Lua 5.1, JIT, 5.2,
+	  and 5.3
 
-	  https://github.com/Tangent128/luasdl2
+	  https://github.com/Tangent128/luasdl2/
 
 comment "lua-sdl2 needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/package/lua-stdlib/Config.in b/package/lua-stdlib/Config.in
index 1843826c2..8bf620d74 100644
--- a/package/lua-stdlib/Config.in
+++ b/package/lua-stdlib/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_LUA_STDLIB
 	bool "lua-stdlib"
 	help
-	  lua-stdlib is a library of modules for common programming
-	  tasks, including list, table and functional operations,
-	  objects, pickling, pretty-printing and command-line option
-	  parsing.
+	  General Lua Libraries
 
-	  https://github.com/lua-stdlib/lua-stdlib/
+	  http://lua-stdlib.github.io/lua-stdlib
diff --git a/package/lua-testmore/Config.in b/package/lua-testmore/Config.in
index 3cbed3840..d6ab702b0 100644
--- a/package/lua-testmore/Config.in
+++ b/package/lua-testmore/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_TESTMORE
 	bool "lua-testmore"
 	help
-	  an Unit Testing Framework.
+	  an Unit Testing Framework
 
 	  https://fperrad.frama.io/lua-TestMore/
diff --git a/package/lua-utf8/Config.in b/package/lua-utf8/Config.in
index 313fa4e45..91671271d 100644
--- a/package/lua-utf8/Config.in
+++ b/package/lua-utf8/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_UTF8
 	bool "lua-utf8"
 	help
-	  This module adds UTF-8 support to Lua.
-	  It's compatible with Lua "string" module.
+	  A UTF-8 support module for Lua
 
 	  http://github.com/starwing/luautf8
diff --git a/package/lua-valua/Config.in b/package/lua-valua/Config.in
index 96b379651..3d442be37 100644
--- a/package/lua-valua/Config.in
+++ b/package/lua-valua/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_LUA_VALUA
 	bool "lua-valua"
 	help
-	  This module provides tools for validating values, very useful
-	  in forms, but also usable elsewhere. It works in appended
-	  chains. Create a new validation object and start chaining
-	  your test functions.
+	  Validation for Lua!
 
 	  https://github.com/sailorproject/valua
diff --git a/package/luabitop/Config.in b/package/luabitop/Config.in
index a819fe8ae..3e29985d2 100644
--- a/package/luabitop/Config.in
+++ b/package/luabitop/Config.in
@@ -2,10 +2,9 @@ config BR2_PACKAGE_LUABITOP
 	bool "luabitop"
 	depends on !BR2_PACKAGE_LUA_5_3
 	help
-	  Lua BitOp is a C extension module for Lua 5.1/5.2 which adds
-	  bitwise operations on numbers.
+	  Lua Bit Operations Module
 
-	  http://bitop.luajit.org
+	  http://bitop.luajit.org/
 
 comment "luabitop needs a Lua 5.1/5.2 interpreter"
 	depends on BR2_PACKAGE_LUA_5_3
diff --git a/package/luacrypto/Config.in b/package/luacrypto/Config.in
index e9d43cd80..641e7ed97 100644
--- a/package/luacrypto/Config.in
+++ b/package/luacrypto/Config.in
@@ -2,10 +2,6 @@ config BR2_PACKAGE_LUACRYPTO
 	bool "luacrypto"
 	select BR2_PACKAGE_OPENSSL
 	help
-	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
-	  library.
-	  The OpenSSL features that are currently exposed are digests
-	  (MD5, SHA-1, HMAC, and more) and crypto-grade random number
-	  generators communication.
+	  A Lua frontend to OpenSSL
 
-	  http://luacrypto.luaforge.net
+	  http://mkottman.github.com/luacrypto/
diff --git a/package/luadbi-sqlite3/Config.in b/package/luadbi-sqlite3/Config.in
index 6ed32a29a..18f275557 100644
--- a/package/luadbi-sqlite3/Config.in
+++ b/package/luadbi-sqlite3/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_LUADBI_SQLITE3
 	bool "luadbi-sqlite3"
-	select BR2_PACKAGE_LUADBI # runtime dependency
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_LUADBI # runtime
 	help
-	  LuaDBI is a database interface library for Lua.
-	  And this is the SQLite3 backend.
+	  Database abstraction layer
 
 	  https://github.com/mwild1/luadbi
diff --git a/package/luadbi/Config.in b/package/luadbi/Config.in
index 2e2905857..49043ab9f 100644
--- a/package/luadbi/Config.in
+++ b/package/luadbi/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_LUADBI
 	bool "luadbi"
 	help
-	  LuaDBI is a database interface library for Lua.
-	  It is designed to provide a RDBMS agnostic API for handling
-	  database operations. LuaDBI also provides support for
-	  prepared statement handles, placeholders and bind parameters
-	  for all database operations.
+	  Database abstraction layer
 
 	  https://github.com/mwild1/luadbi
diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in
index 7139e8c6d..e6ed164f4 100644
--- a/package/luaexpat/Config.in
+++ b/package/luaexpat/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LUAEXPAT
 	bool "luaexpat"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_EXPAT
 	help
-	  LuaExpat is a SAX XML parser based on the Expat library.
+	  XML Expat parsing
 
-	  http://matthewwild.co.uk/projects/luaexpat/
+	  http://www.keplerproject.org/luaexpat/
diff --git a/package/luafilesystem/Config.in b/package/luafilesystem/Config.in
index 50e7975b9..ea851099b 100644
--- a/package/luafilesystem/Config.in
+++ b/package/luafilesystem/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LUAFILESYSTEM
 	bool "luafilesystem"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  LuaFileSystem offers a portable way to access
-	  the underlying directory structure and file attributes.
+	  File System Library for the Lua Programming Language
 
 	  http://keplerproject.github.com/luafilesystem/
diff --git a/package/luajson/Config.in b/package/luajson/Config.in
index c04aa7f00..0358ad05c 100644
--- a/package/luajson/Config.in
+++ b/package/luajson/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_LUAJSON
 	bool "luajson"
-	# run-time dependency
-	select BR2_PACKAGE_LPEG
+	select BR2_PACKAGE_LPEG # runtime
 	help
-	  LuaJSON is a customizable JSON decoder/encoder
-	  using LPEG for parsing.
+	  customizable JSON decoder/encoder
 
 	  http://github.com/harningt/luajson
diff --git a/package/lualogging/Config.in b/package/lualogging/Config.in
index bb87f57f0..a9b2190ef 100644
--- a/package/lualogging/Config.in
+++ b/package/lualogging/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_LUALOGGING
 	bool "lualogging"
 	help
-	  LuaLogging provides a simple API to use logging features in
-	  Lua. Its design was based on log4j. LuaLogging currently
-	  supports, through the use of appenders, console, file, rolling
-	  file, email, socket and SQL outputs.
+	  A simple API to use logging features
 
-	  http://www.keplerproject.org/lualogging/
+	  https://github.com/Neopallium/lualogging
diff --git a/package/luaossl/Config.in b/package/luaossl/Config.in
index d8763e76a..470467b22 100644
--- a/package/luaossl/Config.in
+++ b/package/luaossl/Config.in
@@ -3,14 +3,7 @@ config BR2_PACKAGE_LUAOSSL
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_OPENSSL
 	help
-	  luaossl is a comprehensive binding to OpenSSL for Lua 5.1,
-	  5.2, and later.
-
-	  It includes support for certificate and key management,
-	  key generation, signature verification, and deep bindings
-	  to the distinguished name, alternative name, and X.509v3
-	  extension interfaces. It also binds OpenSSL's bignum, message
-	  digest, HMAC, cipher, and CSPRNG interfaces.
+	  Most comprehensive OpenSSL module in the Lua universe.
 
 	  http://25thandclement.com/~william/projects/luaossl.html
 
diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index 91abcb9e3..67fbca285 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -4,12 +4,8 @@ config BR2_PACKAGE_LUAPOSIX
 	# "bit32" is included in Lua 5.2+. luajit has an equivalent
 	# "bit" module, but since it has a different name, luaposix
 	# doesn't find it.
-	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime
 	help
-	  This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3;
-	  like most libraries it simply binds to C APIs on the
-	  underlying system, so it won't work on non-POSIX systems.
-	  However, it does try to detect the level of POSIX conformance
-	  of the underlying system and bind only available APIs.
+	  Lua bindings for POSIX
 
-	  https://github.com/luaposix/luaposix
+	  http://github.com/luaposix/luaposix/
diff --git a/package/luasec/Config.in b/package/luasec/Config.in
index d7900a081..d22fd57a6 100644
--- a/package/luasec/Config.in
+++ b/package/luasec/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_LUASEC
 	bool "luasec"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
-	  LuaSec is a binding for OpenSSL library to provide TLS/SSL
-	  communication.
+	  A binding for OpenSSL library to provide TLS/SSL communication
+	  over LuaSocket.
 
 	  https://github.com/brunoos/luasec/wiki
diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in
index 45f959e8d..d92a55f78 100644
--- a/package/luasocket/Config.in
+++ b/package/luasocket/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_LUASOCKET
 	bool "luasocket"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  LuaSocket is the most comprehensive networking support library
-	  for the Lua language.
-	  It provides easy access to TCP, UDP, DNS, SMTP,
-	  FTP, HTTP, MIME and much more.
+	  Network support for the Lua language
 
 	  http://luaforge.net/projects/luasocket/
diff --git a/package/luasql-sqlite3/Config.in b/package/luasql-sqlite3/Config.in
index 483d6a0f3..6bad2121f 100644
--- a/package/luasql-sqlite3/Config.in
+++ b/package/luasql-sqlite3/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LUASQL_SQLITE3
 	bool "luasql-sqlite3"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_SQLITE
 	help
-	  LuaSQL is a simple interface from Lua to a DBMS.
+	  Database connectivity for Lua (SQLite3 driver)
 
-	  http://www.keplerproject.org/luasql
+	  http://www.keplerproject.org/luasql/
diff --git a/package/lunit/Config.in b/package/lunit/Config.in
index d6c2c6b15..ceb43da5e 100644
--- a/package/lunit/Config.in
+++ b/package/lunit/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LUNIT
 	bool "lunit"
 	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	help
-	  A unit testing framework for Lua.
+	  A unit testing framework for Lua
 
 	  http://www.mroth.net/lunit/
 
diff --git a/package/orbit/Config.in b/package/orbit/Config.in
index 8df42a838..80624c57c 100644
--- a/package/orbit/Config.in
+++ b/package/orbit/Config.in
@@ -1,15 +1,13 @@
 config BR2_PACKAGE_ORBIT
 	bool "orbit"
 	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
-	# These are runtime dependencies
-	select BR2_PACKAGE_LPEG
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_WSAPI_XAVANTE
+	select BR2_PACKAGE_LPEG # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_WSAPI_XAVANTE # runtime
 	help
-	  An MVC web framework for Lua. The design is inspired by
-	  lightweight Ruby frameworks such as Camping
+	  MVC for Lua Web Development
 
-	  http://keplerproject.github.com/orbit
+	  http://www.keplerproject.org/orbit
 
 comment "orbit needs a Lua 5.1 interpreter"
 	depends on !BR2_PACKAGE_LUA_5_1
diff --git a/package/rings/Config.in b/package/rings/Config.in
index 87ade07cb..1c3b5d444 100644
--- a/package/rings/Config.in
+++ b/package/rings/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_RINGS
 	bool "rings"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  Provides a way to create new Lua states from within Lua.
+	  Create new Lua states from within Lua
 
-	  http://github.com/keplerproject/rings
+	  http://www.keplerproject.org/rings/
diff --git a/package/wsapi-fcgi/Config.in b/package/wsapi-fcgi/Config.in
index b4304a065..08163feec 100644
--- a/package/wsapi-fcgi/Config.in
+++ b/package/wsapi-fcgi/Config.in
@@ -2,11 +2,10 @@ config BR2_PACKAGE_WSAPI_FCGI
 	bool "wsapi-fcgi"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBFCGI
-	# Runtime dependency only
-	select BR2_PACKAGE_WSAPI
+	select BR2_PACKAGE_COXPCALL # runtime
+	select BR2_PACKAGE_RINGS # runtime
+	select BR2_PACKAGE_WSAPI # runtime
 	help
-	  WSAPI is an API that abstracts the web server from Lua web
-	  applications. This is the rock that contains the FCGI module
-	  lfcgi.
+	  Lua Web Server API FastCGI Adapter
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/package/wsapi-xavante/Config.in b/package/wsapi-xavante/Config.in
index 3e494bba8..ae19546fc 100644
--- a/package/wsapi-xavante/Config.in
+++ b/package/wsapi-xavante/Config.in
@@ -1,13 +1,10 @@
 config BR2_PACKAGE_WSAPI_XAVANTE
 	bool "wsapi-xavante"
-	# Runtime dependencies
-	select BR2_PACKAGE_COXPCALL
-	select BR2_PACKAGE_RINGS
-	select BR2_PACKAGE_WSAPI
-	select BR2_PACKAGE_XAVANTE
+	select BR2_PACKAGE_COXPCALL # runtime
+	select BR2_PACKAGE_RINGS # runtime
+	select BR2_PACKAGE_WSAPI # runtime
+	select BR2_PACKAGE_XAVANTE # runtime
 	help
-	  WSAPI is an API that abstracts the web server from Lua web
-	  applications. This is the rock that contains the Xavante
-	  adapter and launcher.
+	  Lua Web Server API - Xavante Handler
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/package/wsapi/Config.in b/package/wsapi/Config.in
index 348a0404b..d8e870c20 100644
--- a/package/wsapi/Config.in
+++ b/package/wsapi/Config.in
@@ -1,10 +1,7 @@
 config BR2_PACKAGE_WSAPI
 	bool "wsapi"
-	# Runtime dependency only
-	select BR2_PACKAGE_COXPCALL
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_RINGS
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
 	help
-	  API that abstracts the web server from Lua web applications.
+	  Lua Web Server API
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/package/xavante/Config.in b/package/xavante/Config.in
index d66ca1f0a..2db896d9c 100644
--- a/package/xavante/Config.in
+++ b/package/xavante/Config.in
@@ -1,14 +1,9 @@
 config BR2_PACKAGE_XAVANTE
 	bool "xavante"
-	# Runtime dependency only
-	select BR2_PACKAGE_COPAS
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_COPAS # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
-	  Xavante is a Lua HTTP 1.1 Web server that uses a modular
-	  architecture based on URI mapped handlers. Xavante currently
-	  offers a file handler, a redirect handler and a WSAPI handler.
-	  Those are used for general files, URI remapping and WSAPI
-	  applications respectively.
+	  Lua Web Server Library
 
-	  http://keplerproject.github.com/xavante/
+	  http://keplerproject.github.io/xavante
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target
  2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
                   ` (3 preceding siblings ...)
  2018-10-21 16:32 ` [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in Francois Perrad
@ 2018-10-21 16:32 ` Francois Perrad
  2018-10-23 23:19   ` Arnout Vandecappelle
  4 siblings, 1 reply; 12+ messages in thread
From: Francois Perrad @ 2018-10-21 16:32 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/pkg-generic.mk  | 6 +++++-
 package/pkg-luarocks.mk | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 91b61c6de..f349c6c1f 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -779,6 +779,9 @@ $(1)-external-deps:
 	@echo "file://$$($(2)_OVERRIDE_SRCDIR)"
 endif
 
+$(1)-upgrade:
+			+$$($(2)_UPGRADE_CMDS)
+
 $(1)-show-version:
 			@echo $$($(2)_VERSION)
 
@@ -1030,7 +1033,8 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
 	$(1)-rsync \
 	$(1)-show-depends \
 	$(1)-show-version \
-	$(1)-source
+	$(1)-source \
+	$(1)-upgrade
 
 ifneq ($$($(2)_SOURCE),)
 ifeq ($$($(2)_SITE),)
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index e2b48cfb4..55f7300d3 100644
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -44,6 +44,14 @@ $(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
 # a target package, and can just add the required dependencies
 $(2)_DEPENDENCIES	+= host-luarocks luainterpreter
 
+# Upgrade helper
+ifndef $(2)_UPGRADE_CMDS
+define $(2)_UPGRADE_CMDS
+	PATH=$(BR_PATH) \
+	utils/scanrock $$($(2)_NAME_UPSTREAM) $(1)
+endef
+endif
+
 #
 # Extract step. Extract into a temporary dir and move the relevant part to the
 # source dir.
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure
  2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
@ 2018-10-23 22:32   ` Arnout Vandecappelle
  2018-10-23 23:14   ` Arnout Vandecappelle
  1 sibling, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 22:32 UTC (permalink / raw)
  To: buildroot

 Hi Francois,

 Excellent initiative!

On 10/21/18 5:32 PM, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  docs/manual/adding-packages-luarocks.txt |  12 ++
>  utils/rockspec2br.lua                    | 238 +++++++++++++++++++++++
>  utils/scanrock                           | 128 ++++++++++++
>  3 files changed, 378 insertions(+)
>  create mode 100644 utils/rockspec2br.lua
>  create mode 100755 utils/scanrock
> 
> diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
> index ec3d4e7cc..8b28c6fa8 100644
> --- a/docs/manual/adding-packages-luarocks.txt
> +++ b/docs/manual/adding-packages-luarocks.txt
> @@ -50,6 +50,18 @@ Finally, on line 16, we invoke the +luarocks-package+
>  macro that generates all the Makefile rules that actually allows the
>  package to be built.
>  
> +Most of these data can be retrieved in the +rock+ and +rockspec+,
> +which are fetched from https://luarocks.org.
> +So, this file and the Config.in can be generated by running
> +the script +utils/scanrock foo lua-foo+ in the Buildroot directory
> +(or in a br2-external tree).

 Maybe add:

The second argument is needed because many lua packages already start with
"lua", and adding an additional lua- in front of it is not needed then, so it is
never added automatically.

Although I'm not entirely sure if that is needed to explain.

 What definitely needs to be addes is:

This script requires luarocks to be intalled on your host.

> +This script creates a Config.in file and lua-foo.mk file for the
> +requested package.
> +You should still manually edit the result.
> +
> +* The +package/Config.in+ file has to be updated manually to include the
> +  generated Config.in files.
> +
>  [[luarocks-package-reference]]
[snip]
> +local function usage ()
> +    print [[
> +Usage:
> +    utils/rockspec2br [-name foo] [-subdir foo-3.2] [-license LICENSE] foo-3.2-1.rockspec

 I don't mind that you only support long options, but we really should be using
the usual convention of --long-option.

> +]]
> +end
> +
> +local function escape (s)
> +    return s:gsub('-', '%%-'):gsub('%.', '%%.')

 I don't understand this... Why do you escape - and ., but not all the other
special characters ().%+-*?[^$ ?

 I found this alternative on stackoverflow [1]:

local function escape (s)
    return s:gsub("([^%w])", "%%%1")


 BTW, is indentation with 4 spaces a lua convention? (It is the Python
convention.) Otherwise, the convention in Buildroot is to indent with tabs.

> +end
> +
> +local function fsname (name)
> +    return name:lower():gsub('_', '-')

 This is not good: if the upstream name has underscores, we want to keep them.
So just lower() is enough.

> +end
> +
> +local function brname (name)
> +    return name:upper():gsub('-', '_')
> +end
> +
> +local function brlicense (license)
> +    if license:match('MIT/X') then
> +        return 'MIT'
> +    end
> +    return license
> +end
> +
> +local function wrap (txt, max)
> +    local lines = {}
> +    local line = ''
> +    for word in txt:gmatch('(%S+)') do
> +        if line:len() + word:len() > max - 1 then
> +            lines[#lines+1] = line
> +            line = ''
> +        end
> +        if line == '' then
> +            line  = word
> +        else
> +            line = line .. ' ' .. word
> +        end
> +    end
> +    lines[#lines+1] = line
> +    return lines
> +end
> +
> +local br_libname = {
> +   curl = 'libcurl',
> +   fastcgi = 'libfcgi',
> +   fuse = 'libfuse',
> +   iconv = 'libiconv',
> +}
> +
> +local function get_native_dependencies ()
 Small nit: since luarocks calls it external_dependencies, I'd keep on calling
it external_dependencies. The resulting variable would be
br_external_dependencies, since you end up with the buildroot-converted names.

> +    local t = {}
> +    local d = external_dependencies

 Is it just me, or is 'external_dependencies' not defined anywhere? Oh, I see,
it comes from the loadfile(rockspec). This is very non-obvious, so please add a
comment everywhere you use a variable that comes from the rockspec. Like:

	local d = external_dependencies   -- from rockspec


> +    if d then
> +        if d.platforms and d.platforms.unix then
> +            d = d.platforms.unix

 I don't think this is correct. I think the platform overrides don't replace the
generic settings but they add to them. Only if a key exists both in d and in
d.platforms.unix, it will be the unix one that is used.

 Also, shouldn't it be linux instead of unix? Or both?

> +        end
> +        for k in pairs(d) do
> +            if k ~= 'platforms' then
> +                k = k:lower()
> +                if k ~= 'crypto' then

 Why skip crypto entirely?

> +                    t[#t+1] = br_libname[k] or k

 Somewhere, you should check if the package exists and emit a warning if not -
perhaps with an indication to update the br_libname table. I think it's better
to run get_native_dependencies once, then do the check and emit warnings, and
then generate the files. It is OK to put the select and DEPENDENCIES in the
generated files even if the packages don't exist, but I think a warning should
be done while it's generated already.

 Hm, but that makes it difficult to do it ina BR2_EXTERNAL... Not sure what to
do about that...


> +                end
> +            end
> +        end
> +        table.sort(t)
> +    end
> +    return t
> +end
> +
> +local br_name = {
> +    basexx = 'lua-basexx',
> +    bit32 = 'lua-bit32',
> +    compat53 = 'lua-compat53',
> +    cqueues = 'lua-cqueues',
> +    datafile = 'lua-datafile',
> +    fifo = 'lua-fifo',
> +    flu = 'lua-flu',
> +    http = 'lua-http',
> +    lpeg_patterns = 'lua-lpeg-patterns',
> +    valua = 'lua-valua',
> +    sailor = 'lua-sailor',

 This is ridiculously fragile. I think it's better to add a complete name
converter after all, that automatically adds the lua- prefix if needed. Then all
of these conversion tables won't be needed.

 lpeg_patterns is the only one that really needs conversion. But that's only
because it's wrongly named in Buildroot. Perhaps you could first submit a patch
that converts lua-lpeg-patterns to lua-lpeg_patterns? Note that the Kconfig
symbol doesn't change so there is no backward compatibility issue (don't forget
to mention that in your commit log).

> +}
> +
> +local function get_dependencies ()
> +    local t = {}
> +    for i = 1, #dependencies do
> +        local dep = dependencies[i]:match('^(%S+)')
> +        if dep ~= 'lua' then
> +            t[#t+1] = br_name[dep] or dep

 So... this is the conversion function! Instead of looking it up in a table,
just prepend it with 'lua-'.

 Except... it turns out that quite a few packages have been misnamed and are
lacking the lua- prefix... So for those a table might be warranted.

> +        end
> +    end
> +    table.sort(t)
> +    return t
> +end
> +
> +local function generate_config (name)
> +    local only_luajit = name:match('^lj')
> +    local summary = description.summary or '???'
> +    local homepage = description.homepage or '???'
> +    local native_dependencies = get_native_dependencies()
> +    local dependencies = get_dependencies()
> +    local fname = 'package/' .. name .. '/Config.in'
> +    local f = assert(io.open(fname, 'w'))
> +    print('write ' .. fname)
> +    f:write('config BR2_PACKAGE_' .. brname(name) .. '\n')
> +    f:write('\tbool "' .. name .. '"\n')
> +    if only_luajit then
> +        f:write('\tdepends on BR2_PACKAGE_LUAJIT\n')
> +    end
> +    for i = 1, #native_dependencies do

 I think

	for i,dep in ipairs(native_dependencies) do
		... dep ...

is more lua-like, but I'm far from a lua expert.

> +        f:write('\tselect BR2_PACKAGE_' .. brname(native_dependencies[i]) .. '\n')
> +    end
> +    for i = 1, #dependencies do
> +        f:write('\tselect BR2_PACKAGE_' .. brname(dependencies[i]) .. ' # runtime\n')
> +    end
> +    f:write('\thelp\n')
> +    f:write('\t  ' .. table.concat(wrap(summary, 62), '\n\t  ') .. '\n')
> +    f:write('\n\t  ' .. homepage .. '\n')
> +    if only_luajit then
> +        f:write('\ncomment "' .. name .. ' needs LuaJIT"\n')
> +        f:write('\tdepends on !BR2_PACKAGE_LUAJIT\n')
> +    end
> +    f:close()
> +end
> +
> +local function generate_mk (name, subdir, license_file)
> +    local need_name_upstream = false
> +    local need_version_upstream = false
> +    local name_upstream = package
> +    local version = version
> +    local version_upstream = version:match('^([^-]+)-')
> +    local revision = version:match('-(%d+)$')
> +    local license = description.license
> +    if subdir then
> +        local root = subdir:match('^(.-)-' .. escape(version) .. '$')
> +        if root then
> +            subdir = root .. '-$(' .. brname(name) .. '_VERSION)'
> +        end
> +        root = subdir:match('^(.--[Vv])' .. escape(version_upstream) .. '$')
> +        if root then
> +            need_version_upstream = true
> +            subdir = root .. '$(' .. brname(name) .. '_VERSION_UPSTREAM)'
> +        end
> +        root = subdir:match('^(.-)-' .. escape(version_upstream) .. '$')
> +        if root then
> +            if root == name then
> +                subdir = nil
> +            elseif root == name_upstream then
> +                subdir = nil
> +                need_name_upstream = true
> +            else
> +                need_version_upstream = true
> +                subdir = root .. '-$(' .. brname(name) .. '_VERSION_UPSTREAM)'
> +            end
> +        end
> +    end
> +    local native_dependencies = get_native_dependencies()
> +    local fname = 'package/' .. name .. '/' .. name .. '.mk'
> +    local f = assert(io.open(fname, 'w'))
> +    print('write ' .. fname)
> +    f:write('################################################################################\n')
> +    f:write('#\n')
> +    f:write('# ' .. name .. '\n')
> +    f:write('#\n')
> +    f:write('################################################################################\n')
> +    f:write('\n')
> +    if need_version_upstream then
> +        f:write(brname(name) .. '_VERSION_UPSTREAM = ' .. version_upstream .. '\n')
> +        f:write(brname(name) .. '_VERSION = $(' .. brname(name) .. '_VERSION_UPSTREAM)-' .. revision .. '\n')
> +    else
> +        f:write(brname(name) .. '_VERSION = ' .. version .. '\n')
> +    end
> +    if name ~= name_upstream:lower() or need_name_upstream then
> +        f:write(brname(name) .. '_NAME_UPSTREAM = ' .. name_upstream .. '\n')
> +    end
> +    if subdir then
> +        f:write(brname(name) .. '_SUBDIR = ' .. subdir .. '\n')
> +    end
> +    if license then
> +        f:write(brname(name) .. '_LICENSE = ' .. brlicense(license) .. '\n')
> +    end
> +    if license_file then
> +        f:write(brname(name) .. '_LICENSE_FILES = $(' .. brname(name) .. '_SUBDIR)/' .. license_file .. '\n')
> +    end
> +    if #native_dependencies > 0 then
> +        f:write(brname(name) .. '_DEPENDENCIES = ' .. table.concat(native_dependencies, ' ') .. '\n')
> +    end
> +    f:write('\n$(eval $(luarocks-package))\n')
> +    f:close()
> +end
> +
> +local name, subdir, license
> +local i = 1
> +if arg[i] == '-name' then
> +    name = arg[i + 1]
> +    i = i + 2
> +end
> +if arg[i] == '-subdir' then
> +    subdir = arg[i + 1]
> +    i = i + 2
> +end
> +if arg[i] == '-license' then
> +    license = arg[i + 1]
> +    i = i + 2
> +end

 Ugh, that's ugly... Can't you use the convention used in shell scripts?

local name, subdir, license, rockspec
local skip = false
for i,a in ipairs(arg)
	if skip then
		skip = false
		continue
	elseif a == '--name' then
		name = arg[i + 1]
		skip = true
	elseif ...
	else
		rockspec = a
		break
	end
end


> +local rockspec = arg[i]
> +if not rockspec then
> +    usage()
> +else
> +    assert(loadfile(rockspec))()
> +    name = fsname(name or package)
> +    generate_config(name)
> +    generate_mk(name, subdir, license)
> +end
> diff --git a/utils/scanrock b/utils/scanrock
> new file mode 100755
> index 000000000..3c13b3228
> --- /dev/null
> +++ b/utils/scanrock
> @@ -0,0 +1,128 @@
> +#!/usr/bin/env perl

 Ugh, no, we're not going to use a perl script to do lua stuff. It should either
be shell or lua. In fact, this script is almost a shell script... And if you do
it in lua, you can just directly require the luarocks modules without going
through an exec.

[snip]

> +qx{luarocks download --source ${rockname}};
> +my $rock = glob q{*.src.rock};
> +
> +chdir $tmpdir;

 You should go into the tmpdir before downloading, otherwise it's possible that
multiple rockfiles are lingering.

> +qx{luarocks unpack ${cwd}/${rock}};
> +my $unpackdir = glob q{*};
> +chdir $unpackdir;
> +my $rockspec = File::Spec->rel2abs( glob q{*.rockspec} );
> +opendir(my $dh, q{.});
> +my @subdir = grep { m|^[^\.]| && -d } readdir($dh);
> +my $subdir = shift @subdir;
> +closedir $dh;
> +chdir $subdir;
> +my @license = glob q{COPY* LICENSE* doc/LICENSE* doc/license* doc/us/license*};
> +my $license = shift @license;

 There should be a warning if the license file is missing.

 Regards,
 Arnout

[snip]

[1] https://stackoverflow.com/questions/9790688/escaping-strings-for-gsub

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 2/5] lua*: regeneration of hash files
  2018-10-21 16:32 ` [Buildroot] [scanrock 2/5] lua*: regeneration of hash files Francois Perrad
@ 2018-10-23 22:42   ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 22:42 UTC (permalink / raw)
  To: buildroot



On 10/21/18 5:32 PM, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files
  2018-10-21 16:32 ` [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files Francois Perrad
@ 2018-10-23 22:56   ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 22:56 UTC (permalink / raw)
  To: buildroot



On 10/21/18 5:32 PM, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

 Just to be sure: they are all completely automatically regenerated without any
manual editing? If there is manual editing involved, please explain so at length
in the commit message.

 And you did that for all existing luarocks packages?

[snip]
> -COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/doc/us/license.html
> +COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/LICENSE

 I double-checked that both files indeed contain the MIT license text, and only
differ in that one is html and the other is plaintext.

[snip]
>  LUA_FLU_VERSION = 20150331-1
> -LUA_FLU_NAME_UPSTREAM = flu
> +LUA_FLU_NAME_UPSTREAM = Flu

 That is interesting... Since it used to work apparently there is no need for an
upstream name with the correct case? Indeed, if the only difference is the case,
then the NAME_UPSTREAM is not needed if _SUBDIR is anyway set explicitly. It's
probably better to set it explicitly anyway.


>  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-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk
> index dd7533af5..ea8e0dd8b 100644
> --- a/package/lua-iconv/lua-iconv.mk
> +++ b/package/lua-iconv/lua-iconv.mk
> @@ -5,8 +5,8 @@
>  ################################################################################
>  
>  LUA_ICONV_VERSION = 7-1
> -LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
>  LUA_ICONV_LICENSE = MIT
>  LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING
> +LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)

 I seem to have missed the code in scanrocks that does this?

[snip]

 Basically, except for the commit message, all is well, so you can add my

 Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in
  2018-10-21 16:32 ` [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in Francois Perrad
@ 2018-10-23 23:02   ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 23:02 UTC (permalink / raw)
  To: buildroot



On 10/21/18 5:32 PM, Francois Perrad wrote:

 As usual, commit message is missing. Please describe at length what you did
manually.

 It looks like a whole lot is indeed done manually, so it's probably better to
do one patch per package in case there are manual fixups (and do the three
things in that one patch), and then a final patch that handles the rest in batch.

[snip]
> diff --git a/package/argparse/Config.in b/package/argparse/Config.in
> index d207b0482..f8e71a0cd 100644
> --- a/package/argparse/Config.in
> +++ b/package/argparse/Config.in
> @@ -1,10 +1,6 @@
>  config BR2_PACKAGE_ARGPARSE
>  	bool "argparse"
>  	help
> -	  Argparse is a feature-rich command line parser for Lua
> -	  inspired by argparse for Python. Argparse supports
> -	  positional arguments, options, flags, optional arguments,
> -	  subcommands and more. Argparse automatically generates
> -	  usage, help and error messages.
> +	  A feature-rich command-line argument parser

 No, this is not good. You can't replace a nice, well-formatted, extensive help
text with a one-line string. Indeed it's all we get from the rockspec, but it
should really be an entire paragraph like it was.

 So if you want to use the scanrock script to assist in upgrading, you'll have
to find a way to preserve what is there already.

 Also, please add scanrock to add a . at the end of the sentence if it is missing.

[snip]

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure
  2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
  2018-10-23 22:32   ` Arnout Vandecappelle
@ 2018-10-23 23:14   ` Arnout Vandecappelle
  1 sibling, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 23:14 UTC (permalink / raw)
  To: buildroot

 One more thing...

On 10/21/18 5:32 PM, Francois Perrad wrote:
> diff --git a/utils/scanrock b/utils/scanrock

 Two things are still missing in this script:

- a check that the package doesn't exist yet;

- a --force option to override that check.

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target
  2018-10-21 16:32 ` [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target Francois Perrad
@ 2018-10-23 23:19   ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2018-10-23 23:19 UTC (permalink / raw)
  To: buildroot



On 10/21/18 5:32 PM, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/pkg-generic.mk  | 6 +++++-
>  package/pkg-luarocks.mk | 8 ++++++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 91b61c6de..f349c6c1f 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -779,6 +779,9 @@ $(1)-external-deps:
>  	@echo "file://$$($(2)_OVERRIDE_SRCDIR)"
>  endif
>  
> +$(1)-upgrade:
> +			+$$($(2)_UPGRADE_CMDS)

 I prefer how you did it in the perl infrastructure: a private target in the
perl infra, nothing in the generic infra. Indeed, I don't think it makes sense
to have such an upgrade possibility in the generic case.

 If it ever does, we can still move it into the generic infra.

> +
>  $(1)-show-version:
>  			@echo $$($(2)_VERSION)
>  
> @@ -1030,7 +1033,8 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
>  	$(1)-rsync \
>  	$(1)-show-depends \
>  	$(1)-show-version \
> -	$(1)-source
> +	$(1)-source \
> +	$(1)-upgrade
>  
>  ifneq ($$($(2)_SOURCE),)
>  ifeq ($$($(2)_SITE),)
> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> index e2b48cfb4..55f7300d3 100644
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -44,6 +44,14 @@ $(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
>  # a target package, and can just add the required dependencies
>  $(2)_DEPENDENCIES	+= host-luarocks luainterpreter
>  
> +# Upgrade helper
> +ifndef $(2)_UPGRADE_CMDS
> +define $(2)_UPGRADE_CMDS
> +	PATH=$(BR_PATH) \
> +	utils/scanrock $$($(2)_NAME_UPSTREAM) $(1)

 This shows a good reason to use the lua-specific upgrade target: we want to use
the Buildroot-built host-luarocks here, I guess, so we should depend on it. In
fact, on my Fedora laptop, with the system-installed luarocks, scanrocks fails
with "Error: Failed copying unpacked rockspec into unpacked source directory."
(in the unpack step; I can reproduce when running manually), but it succeeds
with the Buildroot-built luarocks. So we would want:

$(1)-upgrade: host-luarocks
	PATH=$(BR_PATH) utils/scranrock $$($(2)_NAME_UPSTREAM) $(1)

 Regards,
 Arnout

> +endef
> +endif
> +
>  #
>  # Extract step. Extract into a temporary dir and move the relevant part to the
>  # source dir.
> 

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-10-23 23:19 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-21 16:32 [Buildroot] [scanrock 0/5] scanrock Francois Perrad
2018-10-21 16:32 ` [Buildroot] [scanrock 1/5] utils/scanrock: new utility for Luarocks infrastructure Francois Perrad
2018-10-23 22:32   ` Arnout Vandecappelle
2018-10-23 23:14   ` Arnout Vandecappelle
2018-10-21 16:32 ` [Buildroot] [scanrock 2/5] lua*: regeneration of hash files Francois Perrad
2018-10-23 22:42   ` Arnout Vandecappelle
2018-10-21 16:32 ` [Buildroot] [scanrock 3/5] lua*: regeneration of *.mk files Francois Perrad
2018-10-23 22:56   ` Arnout Vandecappelle
2018-10-21 16:32 ` [Buildroot] [scanrock 4/5] lua*: regeneration of Config.in Francois Perrad
2018-10-23 23:02   ` Arnout Vandecappelle
2018-10-21 16:32 ` [Buildroot] [scanrock 5/5] [RFC] pkg-luarocks: add per package upgrade target Francois Perrad
2018-10-23 23:19   ` Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.