* Re: [oe-commits] [openembedded-core] 05/11: license.bbclass: Introduce AVAILABLE_LICENSES that lists all licenses
[not found] ` <20200128115135.923C8232CB0@git.openembedded.org>
@ 2021-03-30 20:46 ` Martin Jansa
2021-03-30 21:47 ` [OE-core] " Denys Dmytriyenko
0 siblings, 1 reply; 2+ messages in thread
From: Martin Jansa @ 2021-03-30 20:46 UTC (permalink / raw)
To: openembedded-devel, Peter Kjellerstedt
Cc: openembedded-commits,
Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 14764 bytes --]
On Tue, Jan 28, 2020 at 12:52 PM <git@git.openembedded.org> wrote:
> This is an automated email from the git hooks/post-receive script.
>
> rpurdie pushed a commit to branch zeus
> in repository openembedded-core.
>
> commit 5ed714139f91eb03871e01b68a4370784071234d
> Author: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> AuthorDate: Wed Dec 11 17:48:13 2019 +0100
>
> license.bbclass: Introduce AVAILABLE_LICENSES that lists all licenses
>
> Previously, there was SRC_DISTRIBUTE_LICENSES, an undocumented
> variable that contained a static list of licenses. It was used by
> expand_wildcard_licenses() to expand any wildcards used in, e.g.,
> INCOMPATIBLE_LICENSE. However, since this static list of licenses has
> not been kept up-to-date, many licenses were missing, with the result
> that if one tried to use any of those licenses with a wildcard, no
> licenses would be found, effectively ignoring that they should be
> marked as incompatible.
>
> This introduces a new (documented) variable, AVAILABLE_LICENSES, that
> is automatically updated to contain all licenses found in any
> directories specified by ${COMMON_LICENSE_DIR} and ${LICENSE_PATH},
> and uses it instead of SRC_DISTRIBUTE_LICENSES when expanding
> wildcards.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 8c9ef587fe499c612a878a1ab42092eb79b334ef)
> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> ---
> meta/classes/license.bbclass | 27
> ++++++++++++++++++++----
> meta/conf/documentation.conf | 1 +
> meta/lib/oeqa/selftest/cases/incompatible_lic.py | 6 +++---
> 3 files changed, 27 insertions(+), 7 deletions(-)
>
...
> +def available_licenses(d):
> + """
> + Return the available licenses by searching the directories specified
> by
> + COMMON_LICENSE_DIR and LICENSE_PATH.
> + """
> + lic_dirs = ((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' +
> + (d.getVar('LICENSE_PATH') or '')).split()
> +
> + licenses = []
> + for lic_dir in lic_dirs:
> + licenses += os.listdir(lic_dir)
> +
> + licenses = sorted(licenses)
> + return licenses
> +
> +# Only determine the list of all available licenses once. This assumes
> that any
> +# additions to LICENSE_PATH have been done before this file is parsed.
> +AVAILABLE_LICENSES := "${@' '.join(available_licenses(d))}"
> +
>
FWIW this part no longer seems to work correctly, now running:
yocto-check-layer --dependency /OE/meta-openembedded/meta-oe/
/OE/meta-openembedded/meta-python/ -- /OE/meta-openembedded/meta-multimedia/
I've noticed:
INFO: ... ok
INFO: skipped "DistroCheckLayer: Layer meta-multimedia isn't Distro one."
INFO: ======================================================================
INFO: FAIL: test_signatures (common.CommonCheckLayer)
INFO: ----------------------------------------------------------------------
INFO: Traceback (most recent call last):
File
"/OE/build/oe-core/openembedded-core/scripts/lib/checklayer/cases/common.py",
line 55, in test_signatures
self.fail('Adding layer %s changed signatures.\n%s' %
(self.tc.layer['name'], msg))
AssertionError: Adding layer meta-multimedia changed signatures.
88 signatures changed, initial differences (first hash before, second
after):
libdevmapper:do_configure:
61d81f223c9ec5893d05cd355a0f9a6896841c2a1d957eb86c21eb7ce1ccad90 ->
6c38318b639496645b24971358c7c8e3d0d7b0f5ccd8575fab68c042678d4097
bitbake-diffsigs --task libdevmapper do_configure --signature
61d81f223c9ec5893d05cd355a0f9a6896841c2a1d957eb86c21eb7ce1ccad90
6c38318b639496645b24971358c7c8e3d0d7b0f5ccd8575fab68c042678d4097
NOTE: Reconnecting to bitbake server...
basehash changed from
cf65d65a6575e76b468d41acd30ace204137f37eec43f3cf9bed00eb4c127086 to
e0a60ed74c1c002fea3f0883e173b2927c970c6b44c69e943b02d2d47bd1545f
Variable AVAILABLE_LICENSES value changed:
"AAL ACE-TAO-CIAO AFL-1.2 AFL-2.0 AFL-2.1 AFL-3.0 AGPL-3.0-only
AGPL-3.0-or-later ANTLR-PD {+AOM-Patent-License-1.0+} APL-1.0 APSL-1.0
APSL-1.1 APSL-1.2 APSL-2.0 Adobe Apache-1.0 Apache-1.1 Apache-2.0
Apache-2.0-with-LLVM-exception Arphic-Public-License Artistic-1.0
Artistic-2.0 BSD BSD-0-Clause BSD-1-Clause BSD-2-Clause BSD-2-Clause-Patent
BSD-3-Clause BSD-3-Clause-Clear BSD-4-Clause BSL-1.0 {+BellBird+}
BitstreamVera CATOSL-1.1 CC-BY-1.0 CC-BY-2.0 CC-BY-2.5 CC-BY-3.0
CC-BY-NC-1.0 CC-BY-NC-2.0 CC-BY-NC-2.5 CC-BY-NC-3.0 CC-BY-NC-ND-1.0
CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 CC-BY-NC-SA-1.0
CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-1.0 CC-BY-ND-2.0
CC-BY-ND-2.5 CC-BY-ND-3.0 CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5
CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B
CECILL-C {+CMU-Tex+} CPAL-1.0 CPL-1.0 CUA-OPL-1.0 ClArtistic DSSSL ECL-1.0
ECL-2.0 EDL-1.0 EFL-1.0 EFL-2.0 EPL-1.0 EPL-2.0 EUDatagrid EUPL-1.0
EUPL-1.1 Entessa ErlPL-1.1 FLTK FSF-Unlimited Fair Frameworx-1.0
{+Fraunhofer_FDK_AAC_Codec_Library_for_Android+} FreeType GD GFDL-1.1
GFDL-1.2 GFDL-1.3 GPL-1.0-only GPL-1.0-or-later GPL-2-with-bison-exception
GPL-2.0-only GPL-2.0-or-later GPL-2.0-with-GCC-exception
GPL-2.0-with-OpenSSL-exception GPL-2.0-with-autoconf-exception
GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception
GPL-2.0-with-lmbench-restriction GPL-3-with-bison-exception GPL-3.0-only
GPL-3.0-or-later GPL-3.0-with-GCC-exception GPL-3.0-with-autoconf-exception
HDF5 HPND ICU IPA IPL-1.0 ISC ImageMagick Intel Khronos Kilgard
LGPL-2.0-only LGPL-2.0-or-later LGPL-2.1-only LGPL-2.1-or-later
LGPL-3.0-only LGPL-3.0-or-later LLNL LPL-1.02 LPPL-1.0 LPPL-1.1 LPPL-1.2
LPPL-1.3c Libpng MIT MPL-1.0 MPL-1.1 MPL-2.0 MS-PL MS-RL ManishSingh
Mini-XML-License MirOS Motosoto Multics NASA-1.3 NCSA NGPL NPOSL-3.0 NTP
Nauman Nokia OASIS OCLC-2.0 ODbL-1.0 OFL-1.0 OFL-1.1 OGPL OGTSL OLDAP-2.8
OSL-1.0 OSL-2.0 OSL-3.0 OpenLDAP OpenSSL PD PHP-3.0 PSF-2.0 ParaTypeFFL-1.3
PostgreSQL Proprietary Python-2.0 QPL-1.0 QWTv1.0 RHeCos-1 RHeCos-1.1
RPL-1.5 RPSL-1.0 RSCPL Ruby SAX-PD SGI-1 SMAIL_GPL SPL-1.0 SSPL-1
Simple-2.0 Sleepycat SugarCRM-1 SugarCRM-1.1.3 {+Sun+} TLWG UCB UFL Unicode
Unlicense VSL-1.0 W3C WTFPL WXwindows Watcom-1.0 X11 XFree86-1.0
XFree86-1.1 XSL Xnet YPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.1 Zimbra-1.3 Zlib
bzip2-1.0.4 bzip2-1.0.6 eCos-2.0 flite gSOAP-1 gSOAP-1.3b gnuplot iozone3
nbench-byte pkgconf read-edid safec tcl ttf-mplus unRAR unfs3 vim wxWidgets
zsh"
lvm2:do_configure:
3f28ac63b231b6f1b27157c21c517f80944d8c75603212663fc9b2268d558507 ->
c5b60d8dee00f558ef1086a6415c229eac6ac633e06d574b34ec9e47039d9d2a
bitbake-diffsigs --task lvm2 do_configure --signature
3f28ac63b231b6f1b27157c21c517f80944d8c75603212663fc9b2268d558507
c5b60d8dee00f558ef1086a6415c229eac6ac633e06d574b34ec9e47039d9d2a
NOTE: Reconnecting to bitbake server...
basehash changed from
b1ece9d06005c4520a52037d8bb0a2facdecda5977d5e183a44ef84fc6a13671 to
f9b5acc9bf89bf4dfefb50e3e4c2ab08f15a1d3a3005dafe6505c5cd5f03c4e8
Variable AVAILABLE_LICENSES value changed:
"AAL ACE-TAO-CIAO AFL-1.2 AFL-2.0 AFL-2.1 AFL-3.0 AGPL-3.0-only
AGPL-3.0-or-later ANTLR-PD {+AOM-Patent-License-1.0+} APL-1.0 APSL-1.0
APSL-1.1 APSL-1.2 APSL-2.0 Adobe Apache-1.0 Apache-1.1 Apache-2.0
Apache-2.0-with-LLVM-exception Arphic-Public-License Artistic-1.0
Artistic-2.0 BSD BSD-0-Clause BSD-1-Clause BSD-2-Clause BSD-2-Clause-Patent
BSD-3-Clause BSD-3-Clause-Clear BSD-4-Clause BSL-1.0 {+BellBird+}
BitstreamVera CATOSL-1.1 CC-BY-1.0 CC-BY-2.0 CC-BY-2.5 CC-BY-3.0
CC-BY-NC-1.0 CC-BY-NC-2.0 CC-BY-NC-2.5 CC-BY-NC-3.0 CC-BY-NC-ND-1.0
CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 CC-BY-NC-SA-1.0
CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-1.0 CC-BY-ND-2.0
CC-BY-ND-2.5 CC-BY-ND-3.0 CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5
CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B
CECILL-C {+CMU-Tex+} CPAL-1.0 CPL-1.0 CUA-OPL-1.0 ClArtistic DSSSL ECL-1.0
ECL-2.0 EDL-1.0 EFL-1.0 EFL-2.0 EPL-1.0 EPL-2.0 EUDatagrid EUPL-1.0
EUPL-1.1 Entessa ErlPL-1.1 FLTK FSF-Unlimited Fair Frameworx-1.0
{+Fraunhofer_FDK_AAC_Codec_Library_for_Android+} FreeType GD GFDL-1.1
GFDL-1.2 GFDL-1.3 GPL-1.0-only GPL-1.0-or-later GPL-2-with-bison-exception
GPL-2.0-only GPL-2.0-or-later GPL-2.0-with-GCC-exception
GPL-2.0-with-OpenSSL-exception GPL-2.0-with-autoconf-exception
GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception
GPL-2.0-with-lmbench-restriction GPL-3-with-bison-exception GPL-3.0-only
GPL-3.0-or-later GPL-3.0-with-GCC-exception GPL-3.0-with-autoconf-exception
HDF5 HPND ICU IPA IPL-1.0 ISC ImageMagick Intel Khronos Kilgard
LGPL-2.0-only LGPL-2.0-or-later LGPL-2.1-only LGPL-2.1-or-later
LGPL-3.0-only LGPL-3.0-or-later LLNL LPL-1.02 LPPL-1.0 LPPL-1.1 LPPL-1.2
LPPL-1.3c Libpng MIT MPL-1.0 MPL-1.1 MPL-2.0 MS-PL MS-RL ManishSingh
Mini-XML-License MirOS Motosoto Multics NASA-1.3 NCSA NGPL NPOSL-3.0 NTP
Nauman Nokia OASIS OCLC-2.0 ODbL-1.0 OFL-1.0 OFL-1.1 OGPL OGTSL OLDAP-2.8
OSL-1.0 OSL-2.0 OSL-3.0 OpenLDAP OpenSSL PD PHP-3.0 PSF-2.0 ParaTypeFFL-1.3
PostgreSQL Proprietary Python-2.0 QPL-1.0 QWTv1.0 RHeCos-1 RHeCos-1.1
RPL-1.5 RPSL-1.0 RSCPL Ruby SAX-PD SGI-1 SMAIL_GPL SPL-1.0 SSPL-1
Simple-2.0 Sleepycat SugarCRM-1 SugarCRM-1.1.3 {+Sun+} TLWG UCB UFL Unicode
Unlicense VSL-1.0 W3C WTFPL WXwindows Watcom-1.0 X11 XFree86-1.0
XFree86-1.1 XSL Xnet YPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.1 Zimbra-1.3 Zlib
bzip2-1.0.4 bzip2-1.0.6 eCos-2.0 flite gSOAP-1 gSOAP-1.3b gnuplot iozone3
nbench-byte pkgconf read-edid safec tcl ttf-mplus unRAR unfs3 vim wxWidgets
zsh"
And manually running:
bitbake -S none lvm2
with and without meta-multimedia included confirms this behavior:
oe-core$ bitbake-diffsigs
tmp-musl/stamps/core2-64-foo4-linux-musl/lvm2/2.03.11-r0.do_configure.sigdata.21be78ebe2363713cf02f25efd28406fb8025e199e3a7938ee571fcdb33672a1
tmp-musl/stamps/core2-64-foo4-linux-musl/lvm2/2.03.11-r0.do_configure.sigdata.7dfa7612c4916466f8a0b8f067c840e03232536159b6b9dd5e7462e743ef8942
NOTE: Reconnecting to bitbake server...
basehash changed from
f5fbb9749fe3d66410b9fb22eb534b2c0be9190a00b6c5ee1b2615de3ad771f1 to
f33a319864313d451d4434a4c7d87eaa47553904c044c07223655e51b4209e6d
Variable AVAILABLE_LICENSES value changed:
"AAL ACE-TAO-CIAO AFL-1.2 AFL-2.0 AFL-2.1 AFL-3.0 AGPL-3.0-only
AGPL-3.0-or-later ANTLR-PD {+AOM-Patent-License-1.0+} APL-1.0 APSL-1.0
APSL-1.1 APSL-1.2 APSL-2.0 Adobe Apache-1.0 Apache-1.1 Apache-2.0
Apache-2.0-with-LLVM-exception Arphic-Public-License Artistic-1.0
Artistic-2.0 BSD BSD-0-Clause BSD-1-Clause BSD-2-Clause BSD-2-Clause-Patent
BSD-3-Clause BSD-3-Clause-Clear BSD-4-Clause BSL-1.0 {+BellBird+}
BitstreamVera Broadcom-RPi CATOSL-1.1 CC-BY-1.0 CC-BY-2.0 CC-BY-2.5
CC-BY-3.0 CC-BY-NC-1.0 CC-BY-NC-2.0 CC-BY-NC-2.5 CC-BY-NC-3.0
CC-BY-NC-ND-1.0 CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0
CC-BY-NC-SA-1.0 CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0
CC-BY-ND-1.0 CC-BY-ND-2.0 CC-BY-ND-2.5 CC-BY-ND-3.0 CC-BY-SA-1.0
CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 CDDL-1.0
CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C {+CMU-Tex+} CPAL-1.0 CPL-1.0
CUA-OPL-1.0 ClArtistic DMTF DSSSL Digia-Qt-LGPL-Exception-1.1 ECL-1.0
ECL-2.0 EDL-1.0 EFL-1.0 EFL-2.0 EPL-1.0 EPL-2.0 EUDatagrid EUPL-1.0
EUPL-1.1 Entessa ErlPL-1.1 FLTK FSF-Unlimited Fair Frameworx-1.0
{+Fraunhofer_FDK_AAC_Codec_Library_for_Android+} FreeType GD GFDL-1.1
GFDL-1.2 GFDL-1.3 GPL-1.0-only GPL-1.0-or-later GPL-2-with-bison-exception
GPL-2.0-only GPL-2.0-or-later GPL-2.0-with-GCC-exception
GPL-2.0-with-OpenSSL-exception GPL-2.0-with-autoconf-exception
GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception
GPL-2.0-with-lmbench-restriction GPL-3-with-bison-exception GPL-3.0-only
GPL-3.0-or-later GPL-3.0-with-GCC-exception GPL-3.0-with-autoconf-exception
HDF5 HPND ICU IPA IPL-1.0 ISC ImageMagick Intel Intel-ACPI Khronos Kilgard
LGPL-2.0-only LGPL-2.0-or-later LGPL-2.1-only LGPL-2.1-or-later
LGPL-3.0-only LGPL-3.0-or-later LLNL LLNL LPL-1.02 LPPL-1.0 LPPL-1.1
LPPL-1.2 LPPL-1.3c Libpng MIT MPL-1.0 MPL-1.1 MPL-2.0 MS-PL MS-RL
ManishSingh Mini-XML-License MirOS Motosoto Multics NASA-1.3 NCSA NGPL
NPOSL-3.0 NTP Nauman NewRelic Nokia OASIS OCLC-2.0 ODbL-1.0 OFL-1.0 OFL-1.1
OGPL OGTSL OLDAP-2.8 OML OSL-1.0 OSL-2.0 OSL-3.0 OpenLDAP OpenSSL PD
PHP-3.0 PSF-2.0 ParaTypeFFL-1.3 PostgreSQL Proprietary Python-2.0 QPL-1.0
QWTv1.0 RHeCos-1 RHeCos-1.1 RPL-1.5 RPSL-1.0 RSCPL Ruby SAX-PD SGI-1
SMAIL_GPL SPL-1.0 SSPL-1 Simple-2.0 Sleepycat SugarCRM-1 SugarCRM-1.1.3
{+Sun+} TLWG The-Qt-Company-Commercial The-Qt-Company-GPL-Exception-1.0 UCB
UFL Unicode Unicode Unlicense VSL-1.0 W3C WTFPL WXwindows Watcom-1.0 X11
XFree86-1.0 XFree86-1.1 XSL Xdebug Xnet YPL-1.1 ZPL-1.1 ZPL-2.0 ZPL-2.1
Zimbra-1.3 Zlib bzip2-1.0.4 bzip2-1.0.6 copyleft-next-0.3.0 eCos-2.0 flite
gSOAP-1 gSOAP-1.3b gnuplot iozone3 nbench-byte netperf pkgconf radvd
read-edid safec tcl ttf-mplus unRAR unfs3 vim wxWidgets zsh"
meta-networking adds to LICENSE_PATH like many other layers:
oe-core$ grep LICENSE_PATH meta-openembedded/meta*/conf/layer.conf
meta-openembedded/meta-multimedia/conf/layer.conf:LICENSE_PATH +=
"${LAYERDIR}/licenses"
meta-openembedded/meta-networking/conf/layer.conf:LICENSE_PATH +=
"${LAYERDIR}/licenses"
meta-openembedded/meta-oe/conf/layer.conf:LICENSE_PATH +=
"${LAYERDIR}/licenses"
meta-openembedded/meta-python/conf/layer.conf:LICENSE_PATH +=
"${LAYERDIR}/licenses"
meta-openembedded/meta-webserver/conf/layer.conf:LICENSE_PATH +=
"${LAYERDIR}/licenses"
so nothing strange there, but lvm2.inc is a bit fishy with:
inherit autotools-brokensep pkgconfig systemd license
the license inherit was added long time ago with:
commit e257af489347851d0781b3882f711f580f245fbb
Author: Kai Kang <kai.kang@windriver.com>
Date: Sun Sep 24 08:51:20 2017 +0800
lvm2: refactoring code to disable package config thin-provisioning-tools
bitbake-diffsigs
tmp-musl/stamps/core2-64-foo4-linux-musl/lvm2/2.03.11-r0.do_configure.sigdata.7dfa7612c4916466f8a0b8f067c840e03232536159b6b9dd5e7462e743ef8942
| grep AVAILABLE_LICENSES | grep List.of.dep
List of dependencies for variable AVAILABLE_LICENSES is set()
List of dependencies for variable expand_wildcard_licenses is
{'AVAILABLE_LICENSES'}
Anyone seeing the same? I wonder if it was somehow introduced in recent
licensing changes, but I don't see anything obvious and I thought that
check-yocto-layer used to pass for meta-multimedia before.
[-- Attachment #2: Type: text/html, Size: 16268 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread