From patchwork Mon Apr 2 14:15:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 894207 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="ojbkUVMI"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40FDl90JVcz9ryG for ; Tue, 3 Apr 2018 00:15:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 749E4227B9; Mon, 2 Apr 2018 14:15:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VZIjIFREBKS3; Mon, 2 Apr 2018 14:15:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 173B122777; Mon, 2 Apr 2018 14:15:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CDAD91CEBE9 for ; Mon, 2 Apr 2018 14:15:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CA39C885D3 for ; Mon, 2 Apr 2018 14:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eJJGyetQgqss for ; Mon, 2 Apr 2018 14:15:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5A20F88593 for ; Mon, 2 Apr 2018 14:15:11 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id v21so25866799wmc.1 for ; Mon, 02 Apr 2018 07:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=67eWdSckDu2FV5kVn0YhLSPVntNOm49C7dKtrsV6z8o=; b=ojbkUVMIqUTaEOky5wIHxYHXkR1A5f43agNjwd9UbN8VWZjbsx4AfRSqKkBWdUveFH jT9NR+gh1a9ttm1mX70bIPJ/0J6DQu75o7F/8u/ejSc1CyAo9nj6blYtntt11D0mdbuJ ezfZc/Mb9QgvvseqrwUGaUFG+htSrBFlg7+jkfxgDJ+yV7xkHB5nl8TV4SuHO1Yc3K/s tnBt0s736TXqjdnw76lkfUszNFYGKlSCt9TQaha+3YW5f2/0czr0CJwjNKJ6BVmznw+h qPpLi0R8qMlo4TIgvtgM/GCtnsR3DX8vBoh+hSdFxvJRN3h4BoZZAWDnb4SMJohdva29 BjPg== 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; bh=67eWdSckDu2FV5kVn0YhLSPVntNOm49C7dKtrsV6z8o=; b=cjnVduw2UNTa3TLhM67UUGGLx4tvtk8I7WAcTaD7oddEwJ/fytljJSJ2r+ZufbFigw Wp5rRB/jba89Cx/eapZLFlFJgq5/XlwLEHoptktJWFG0jcaFGX9f8LIzOoaOx1sCHPtz zzBn3sUiTdmDfSNvfCM4Gw5zD6BQowHSf7ytmn3umRGvpqFmi/bowtwGymuW7f/9ai0X dAUFbqCHCZG8DztsFkXXT3p4RU5bM4Rpc2WY8QNWkvj8pSD0ZBGY75/2j3px+Xo6NNJ7 pQDWT5tm0tG+stjsBT02jUr0URDjcUFTgc+qutGoiuLuuG5uVw0otU0wNjb+nv1ZPYUQ 9nxw== X-Gm-Message-State: AElRT7HD0YS+jvMXjSNaDZyMkHpf6nbsPkhLNMAuQcqZH2K2qbFzhgCI /UKvxuehHD8MpFa+XYN+uDS7wkzxycg= X-Google-Smtp-Source: AIpwx4+EQbVitQ8kMTwbCFcASCP4EKAjRsVdEo3LTLCYfpd7ZehlH8LRQePL/asufL8W0JMF+bsZ0Q== X-Received: by 10.28.245.11 with SMTP id t11mr980270wmh.115.1522678509508; Mon, 02 Apr 2018 07:15:09 -0700 (PDT) Received: from vandecaa-laptop.online.net ([195.154.228.195]) by smtp.gmail.com with ESMTPSA id a62sm1075334wmh.5.2018.04.02.07.15.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 07:15:08 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Mon, 2 Apr 2018 16:15:08 +0200 Message-Id: <20180402141508.10278-1-arnout@mind.be> X-Mailer: git-send-email 2.16.3 Subject: [Buildroot] [PATCH] qt5script: correct license information X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The license information in qt5script was just copied from all the other qt5 modules, but it is different (and complicated). - libQt5Script itself contains the third-party JavaScriptCore source. JavaScriptCore has a number of licenses: BSD-2-Clause, BSD-3-Clause, LGPL-2.0+, LGPL-2.1+. Since it is all linked together, the end result will be BSD-3-Clause or LGPL-2.1+. The different BSD licenses are all slightly different (different authors, which affects the third clause in particular). Only one separate license file is provided, so let's use that one. There is an LGPL-2.0 license file, which is slightly different from the top-level LICENSE.LGPLv21, so let's add that one as well. - libQt5Script also contains Qt-specific code which is all licensed under LGPL-2.1 only. This is covered by the LICENSE.LGPLv21 file. It merges with the LGPL-2.1+ from JavaScriptCore but limits it to 2.1 only. - libQt5ScriptTools is a separate libary containing just the script debugger. It is covered by the usual Qt license: * LGPL-2.1 or LGPL-3.0 with exception for Qt 5.6; * LGPL-3.0 or GPL-2.0+ for Qt 5.9 (actually it is GPL-2.0 or GPL-3.0 or any later version approved by the KDE Qt foundation, but let's keep it simple :-). Note that there is no LICENSE.GPLv2 provided, only LICENSE.GPLv3. Also, there is no mention of the exception in the Qt 5.9 sources, even though the LGPL_EXCEPTION.txt is still present. Update the license information with all of the above. Also add hashes for the new license files from JavaScriptCore. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5script/qt5script.hash | 2 ++ package/qt5/qt5script/qt5script.mk | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index bcb37801a8..9b43e5fd65 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -10,3 +10,5 @@ sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE. sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB +sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index b6c02d0d1c..9539f56df6 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -10,8 +10,21 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES -QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +# JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. +# This is linked into libQt5Script, which also contains Qt sources under +# LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause. +# libQt5ScriptTools is under the normal Qt opensource license. +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv3 LICENSE.FDL +else +QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs) +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL +endif +# License files from JavaScriptCore +QT5SCRIPT_LICENSE_FILES += \ + src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \ + src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING define QT5SCRIPT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)