From patchwork Mon Apr 5 10:25:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1462302 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=noLGKVqa; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FDRdj2xY1z9sSC for ; Mon, 5 Apr 2021 20:26:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F3BCD40608; Mon, 5 Apr 2021 10:26:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2OcQOD5QyBWH; Mon, 5 Apr 2021 10:26:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 1996A41B8A; Mon, 5 Apr 2021 10:26:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4EDEC1BF3BB for ; Mon, 5 Apr 2021 10:25:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3E665847F0 for ; Mon, 5 Apr 2021 10:25:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EO2zMsnXJJ5g for ; Mon, 5 Apr 2021 10:25:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by smtp1.osuosl.org (Postfix) with ESMTPS id 95C0F8452A for ; Mon, 5 Apr 2021 10:25:58 +0000 (UTC) Received: by mail-wr1-x429.google.com with SMTP id v11so10505989wro.7 for ; Mon, 05 Apr 2021 03:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EX5TgEMy5bCEac+Q68g2uefvyuiEufDTbb7rlpBJa7o=; b=noLGKVqanFC0EVJA5eDrXSXiy7oD23N4Zb71U0rhaqPX4uC696KiJAreIcXLU4FNVV cgIhxFePSkdALCsgsUZg2gMJXpACMZNbwo+OBTXYef4DW9xqIC1mVZex7UI/pNdj3ShU z6zfvIHCpwoFhcRpaFRpB65fXKiZUHKKh10QqzjZeOfEB2t4YS1BoZwJpX1MDkRJdQlD SYVVE9ug31v52ykmroTepk6ptJpaTbsQm8p9/LrF7bYc60lixs8fxuvLl0/hUppjEnFX HpZqim7mstc14fuoYw3PIhM92Suhs2HAU2QP+ncurK8228yh6p0m3CaRLygOiyOx1ZkD X3cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EX5TgEMy5bCEac+Q68g2uefvyuiEufDTbb7rlpBJa7o=; b=gK0zrxu4uTVRe+AaF5RkA5aQmGVKVIEi3FS2kRSxTRNDvdfKBea2A1VAdpAoNGy4fL wPkgTIHskGTPnWkNPvEpMvPZV1vvV9KEPGK18szExbYAwzzL+iKbZPWQ/eISTO5t/NCZ s/0K05dI82jaxLdE5nVbH3+GnP4/uia6EoF1MaP/lwBgFve1WWR8NkTboxVWSsj7zFs+ 505MAKcdZcBoiCvbnpd0NO6Y7OTi5yiEDqQFM0dzQc8mRWPNmoDoVPSM8O1CRPvLIW1O pQh4Vwwcs2lwms7K/tmSlkAAtkjlWDflvl3aZmGtcVMwl0O+a5oIsLDlr/DCw1FiTrDQ Gd/A== X-Gm-Message-State: AOAM533kRsHk7DSH8OXCHF7xWb6rjxQrNXkok1+vxEIxEc1IuiIS1aah AClarvBMznTQWG1V9ffa82kQkjXB73s= X-Google-Smtp-Source: ABdhPJzNmPEF1iSkoEpO2b98ADD3HOI39F3RSWNayaJHzY3QOACQd2X5QzjnSECCo0f99dnfGOZECA== X-Received: by 2002:a5d:544a:: with SMTP id w10mr290106wrv.59.1617618356963; Mon, 05 Apr 2021 03:25:56 -0700 (PDT) Received: from vm2020.10 (12.197.24.93.rev.sfr.net. [93.24.197.12]) by smtp.gmail.com with ESMTPSA id h63sm1927575wmh.13.2021.04.05.03.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Apr 2021 03:25:56 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Mon, 5 Apr 2021 12:25:45 +0200 Message-Id: <20210405102545.176490-2-francois.perrad@gadz.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210405102545.176490-1-francois.perrad@gadz.org> References: <20210405102545.176490-1-francois.perrad@gadz.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/luarocks: improve detection of license files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Francois Perrad --- package/luarocks/buildroot.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 67dac33aa..2d160f02b 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -380,8 +380,8 @@ function buildroot.command(args) if #licenses == 0 then for i = 1, #files do local v = files[i] - if v:match('^doc/LICENSE') - or v:match('^doc/license') + if v:match('^docs?/LICENSE') + or v:match('^docs?/license') or v:match('^doc/us/license') then licenses[#licenses+1] = v digest[v], err = get_digest(v)