licences: Move exceptions to subdirectory
PATCH 1/1 licences: Move exceptions to subdirectory
Moves the SPDX license exceptions to a subdirectory to make the easier to identify as license exceptions vs. actual licenses
This should have no effect on other layers since SPDX doesn't allow custom Exceptions like it does for Licenses (via LicenseRef-); since we have already enumerated all known exceptions, its unlikely any other layer have added their own
---
meta/files/common-licenses/{ => exceptions}/389-exception | 0
.../common-licenses/{ => exceptions}/Asterisk-exception | 0
.../{ => exceptions}/Asterisk-linking-protocols-exception | 0
.../common-licenses/{ => exceptions}/Autoconf-exception-2.0 | 0
.../common-licenses/{ => exceptions}/Autoconf-exception-3.0 | 0
.../{ => exceptions}/Autoconf-exception-generic | 0
.../{ => exceptions}/Autoconf-exception-generic-3.0 | 0
.../{ => exceptions}/Autoconf-exception-macro | 0
.../common-licenses/{ => exceptions}/Bison-exception-1.24 | 0
.../common-licenses/{ => exceptions}/Bison-exception-2.2 | 0
.../common-licenses/{ => exceptions}/Bootloader-exception | 0
.../common-licenses/{ => exceptions}/CGAL-linking-exception | 0
.../common-licenses/{ => exceptions}/CLISP-exception-2.0 | 0
.../{ => exceptions}/Classpath-exception-2.0 | 0
.../{ => exceptions}/Classpath-exception-2.0-short | 0
.../{ => exceptions}/DigiRule-FOSS-exception | 0
.../{ => exceptions}/Digia-Qt-LGPL-exception-1.1 | 0
meta/files/common-licenses/{ => exceptions}/FLTK-exception | 0
.../{ => exceptions}/Fawkes-Runtime-exception | 0
.../common-licenses/{ => exceptions}/Font-exception-2.0 | 0
.../common-licenses/{ => exceptions}/GCC-exception-2.0 | 0
.../common-licenses/{ => exceptions}/GCC-exception-2.0-note | 0
.../common-licenses/{ => exceptions}/GCC-exception-3.1 | 0
meta/files/common-licenses/{ => exceptions}/GNAT-exception | 0
.../{ => exceptions}/GNOME-examples-exception | 0
.../common-licenses/{ => exceptions}/GNU-compiler-exception | 0
.../{ => exceptions}/GPL-3.0-389-ds-base-exception | 0
.../{ => exceptions}/GPL-3.0-interface-exception | 0
.../{ => exceptions}/GPL-3.0-linking-exception | 0
.../{ => exceptions}/GPL-3.0-linking-source-exception | 0
meta/files/common-licenses/{ => exceptions}/GPL-CC-1.0 | 0
.../{ => exceptions}/GStreamer-exception-2005 | 0
.../{ => exceptions}/GStreamer-exception-2008 | 0
meta/files/common-licenses/{ => exceptions}/Gmsh-exception | 0
.../{ => exceptions}/Independent-modules-exception | 0
.../{ => exceptions}/KiCad-libraries-exception | 0
.../{ => exceptions}/LGPL-3.0-linking-exception | 0
meta/files/common-licenses/{ => exceptions}/LLGPL | 0
meta/files/common-licenses/{ => exceptions}/LLVM-exception | 0
meta/files/common-licenses/{ => exceptions}/LZMA-exception | 0
.../common-licenses/{ => exceptions}/Libtool-exception | 0
.../common-licenses/{ => exceptions}/Linux-syscall-note | 0
.../common-licenses/{ => exceptions}/OCCT-exception-1.0 | 0
.../{ => exceptions}/OCaml-LGPL-linking-exception | 0
.../{ => exceptions}/OpenJDK-assembly-exception-1.0 | 0
meta/files/common-licenses/{ => exceptions}/PCRE2-exception | 0
.../{ => exceptions}/PS-or-PDF-font-exception-20170817 | 0
.../{ => exceptions}/QPL-1.0-INRIA-2004-exception | 0
.../common-licenses/{ => exceptions}/Qt-GPL-exception-1.0 | 0
.../common-licenses/{ => exceptions}/Qt-LGPL-exception-1.1 | 0
.../common-licenses/{ => exceptions}/Qwt-exception-1.0 | 0
.../{ => exceptions}/RRDtool-FLOSS-exception-2.0 | 0
meta/files/common-licenses/{ => exceptions}/SANE-exception | 0
meta/files/common-licenses/{ => exceptions}/SHL-2.0 | 0
meta/files/common-licenses/{ => exceptions}/SHL-2.1 | 0
meta/files/common-licenses/{ => exceptions}/SWI-exception | 0
.../{ => exceptions}/Simple-Library-Usage-exception | 0
meta/files/common-licenses/{ => exceptions}/Swift-exception | 0
.../common-licenses/{ => exceptions}/Texinfo-exception | 0
meta/files/common-licenses/{ => exceptions}/UBDL-exception | 0
.../{ => exceptions}/Universal-FOSS-exception-1.0 | 0
.../{ => exceptions}/WxWindows-exception-3.1 | 0
.../{ => exceptions}/cryptsetup-OpenSSL-exception | 0
.../common-licenses/{ => exceptions}/eCos-exception-2.0 | 0
.../{ => exceptions}/erlang-otp-linking-exception | 0
meta/files/common-licenses/{ => exceptions}/fmt-exception | 0
.../common-licenses/{ => exceptions}/freertos-exception-2.0 | 0
.../common-licenses/{ => exceptions}/gnu-javamail-exception | 0
.../common-licenses/{ => exceptions}/harbour-exception | 0
.../common-licenses/{ => exceptions}/i2p-gpl-java-exception | 0
.../{ => exceptions}/kvirc-openssl-exception | 0
.../{ => exceptions}/libpri-OpenH323-exception | 0
meta/files/common-licenses/{ => exceptions}/mif-exception | 0
meta/files/common-licenses/{ => exceptions}/mxml-exception | 0
.../{ => exceptions}/openvpn-openssl-exception | 0
.../common-licenses/{ => exceptions}/polyparse-exception | 0
meta/files/common-licenses/{ => exceptions}/romic-exception | 0
.../{ => exceptions}/rsync-linking-exception | 0
.../{ => exceptions}/sqlitestudio-OpenSSL-exception | 0
.../common-licenses/{ => exceptions}/stunnel-exception | 0
.../common-licenses/{ => exceptions}/u-boot-exception-2.0 | 0
.../{ => exceptions}/vsftpd-openssl-exception | 0
.../{ => exceptions}/x11vnc-openssl-exception | 0
meta/lib/oe/license.py | 6 ++++++
scripts/pull-spdx-licenses.py | 2 +-
85 files changed, 7 insertions(+), 1 deletion(-)
rename meta/files/common-licenses/{ => exceptions}/389-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Asterisk-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Asterisk-linking-protocols-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Autoconf-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Autoconf-exception-3.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Autoconf-exception-generic (100%)
rename meta/files/common-licenses/{ => exceptions}/Autoconf-exception-generic-3.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Autoconf-exception-macro (100%)
rename meta/files/common-licenses/{ => exceptions}/Bison-exception-1.24 (100%)
rename meta/files/common-licenses/{ => exceptions}/Bison-exception-2.2 (100%)
rename meta/files/common-licenses/{ => exceptions}/Bootloader-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/CGAL-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/CLISP-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Classpath-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Classpath-exception-2.0-short (100%)
rename meta/files/common-licenses/{ => exceptions}/DigiRule-FOSS-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Digia-Qt-LGPL-exception-1.1 (100%)
rename meta/files/common-licenses/{ => exceptions}/FLTK-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Fawkes-Runtime-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Font-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/GCC-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/GCC-exception-2.0-note (100%)
rename meta/files/common-licenses/{ => exceptions}/GCC-exception-3.1 (100%)
rename meta/files/common-licenses/{ => exceptions}/GNAT-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GNOME-examples-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GNU-compiler-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GPL-3.0-389-ds-base-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GPL-3.0-interface-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GPL-3.0-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GPL-3.0-linking-source-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/GPL-CC-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/GStreamer-exception-2005 (100%)
rename meta/files/common-licenses/{ => exceptions}/GStreamer-exception-2008 (100%)
rename meta/files/common-licenses/{ => exceptions}/Gmsh-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Independent-modules-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/KiCad-libraries-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/LGPL-3.0-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/LLGPL (100%)
rename meta/files/common-licenses/{ => exceptions}/LLVM-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/LZMA-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Libtool-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Linux-syscall-note (100%)
rename meta/files/common-licenses/{ => exceptions}/OCCT-exception-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/OCaml-LGPL-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/OpenJDK-assembly-exception-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/PCRE2-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/PS-or-PDF-font-exception-20170817 (100%)
rename meta/files/common-licenses/{ => exceptions}/QPL-1.0-INRIA-2004-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Qt-GPL-exception-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/Qt-LGPL-exception-1.1 (100%)
rename meta/files/common-licenses/{ => exceptions}/Qwt-exception-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/RRDtool-FLOSS-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/SANE-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/SHL-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/SHL-2.1 (100%)
rename meta/files/common-licenses/{ => exceptions}/SWI-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Simple-Library-Usage-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Swift-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Texinfo-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/UBDL-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/Universal-FOSS-exception-1.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/WxWindows-exception-3.1 (100%)
rename meta/files/common-licenses/{ => exceptions}/cryptsetup-OpenSSL-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/eCos-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/erlang-otp-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/fmt-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/freertos-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/gnu-javamail-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/harbour-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/i2p-gpl-java-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/kvirc-openssl-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/libpri-OpenH323-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/mif-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/mxml-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/openvpn-openssl-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/polyparse-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/romic-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/rsync-linking-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/sqlitestudio-OpenSSL-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/stunnel-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/u-boot-exception-2.0 (100%)
rename meta/files/common-licenses/{ => exceptions}/vsftpd-openssl-exception (100%)
rename meta/files/common-licenses/{ => exceptions}/x11vnc-openssl-exception (100%)meta/files/common-licenses/exceptions/389-exception renamed from meta/files/common-licenses/389-exception +0 -0
meta/files/common-licenses/exceptions/Asterisk-exception renamed from meta/files/common-licenses/Asterisk-exception +0 -0
meta/files/common-licenses/exceptions/Asterisk-linking-protocols-exception renamed from meta/files/common-licenses/Asterisk-linking-protocols-exception +0 -0
meta/files/common-licenses/exceptions/Autoconf-exception-2.0 renamed from meta/files/common-licenses/Autoconf-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/Autoconf-exception-3.0 renamed from meta/files/common-licenses/Autoconf-exception-3.0 +0 -0
meta/files/common-licenses/exceptions/Autoconf-exception-generic renamed from meta/files/common-licenses/Autoconf-exception-generic +0 -0
meta/files/common-licenses/exceptions/Autoconf-exception-generic-3.0 renamed from meta/files/common-licenses/Autoconf-exception-generic-3.0 +0 -0
meta/files/common-licenses/exceptions/Autoconf-exception-macro renamed from meta/files/common-licenses/Autoconf-exception-macro +0 -0
meta/files/common-licenses/exceptions/Bison-exception-1.24 renamed from meta/files/common-licenses/Bison-exception-1.24 +0 -0
meta/files/common-licenses/exceptions/Bison-exception-2.2 renamed from meta/files/common-licenses/Bison-exception-2.2 +0 -0
meta/files/common-licenses/exceptions/Bootloader-exception renamed from meta/files/common-licenses/Bootloader-exception +0 -0
meta/files/common-licenses/exceptions/CGAL-linking-exception renamed from meta/files/common-licenses/CGAL-linking-exception +0 -0
meta/files/common-licenses/exceptions/CLISP-exception-2.0 renamed from meta/files/common-licenses/CLISP-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/Classpath-exception-2.0 renamed from meta/files/common-licenses/Classpath-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/Classpath-exception-2.0-short renamed from meta/files/common-licenses/Classpath-exception-2.0-short +0 -0
meta/files/common-licenses/exceptions/DigiRule-FOSS-exception renamed from meta/files/common-licenses/DigiRule-FOSS-exception +0 -0
meta/files/common-licenses/exceptions/Digia-Qt-LGPL-exception-1.1 renamed from meta/files/common-licenses/Digia-Qt-LGPL-exception-1.1 +0 -0
meta/files/common-licenses/exceptions/FLTK-exception renamed from meta/files/common-licenses/FLTK-exception +0 -0
meta/files/common-licenses/exceptions/Fawkes-Runtime-exception renamed from meta/files/common-licenses/Fawkes-Runtime-exception +0 -0
meta/files/common-licenses/exceptions/Font-exception-2.0 renamed from meta/files/common-licenses/Font-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/GCC-exception-2.0 renamed from meta/files/common-licenses/GCC-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/GCC-exception-2.0-note renamed from meta/files/common-licenses/GCC-exception-2.0-note +0 -0
meta/files/common-licenses/exceptions/GCC-exception-3.1 renamed from meta/files/common-licenses/GCC-exception-3.1 +0 -0
meta/files/common-licenses/exceptions/GNAT-exception renamed from meta/files/common-licenses/GNAT-exception +0 -0
meta/files/common-licenses/exceptions/GNOME-examples-exception renamed from meta/files/common-licenses/GNOME-examples-exception +0 -0
meta/files/common-licenses/exceptions/GNU-compiler-exception renamed from meta/files/common-licenses/GNU-compiler-exception +0 -0
meta/files/common-licenses/exceptions/GPL-3.0-389-ds-base-exception renamed from meta/files/common-licenses/GPL-3.0-389-ds-base-exception +0 -0
meta/files/common-licenses/exceptions/GPL-3.0-interface-exception renamed from meta/files/common-licenses/GPL-3.0-interface-exception +0 -0
meta/files/common-licenses/exceptions/GPL-3.0-linking-exception renamed from meta/files/common-licenses/GPL-3.0-linking-exception +0 -0
meta/files/common-licenses/exceptions/GPL-3.0-linking-source-exception renamed from meta/files/common-licenses/GPL-3.0-linking-source-exception +0 -0
meta/files/common-licenses/exceptions/GPL-CC-1.0 renamed from meta/files/common-licenses/GPL-CC-1.0 +0 -0
meta/files/common-licenses/exceptions/GStreamer-exception-2005 renamed from meta/files/common-licenses/GStreamer-exception-2005 +0 -0
meta/files/common-licenses/exceptions/GStreamer-exception-2008 renamed from meta/files/common-licenses/GStreamer-exception-2008 +0 -0
meta/files/common-licenses/exceptions/Gmsh-exception renamed from meta/files/common-licenses/Gmsh-exception +0 -0
meta/files/common-licenses/exceptions/Independent-modules-exception renamed from meta/files/common-licenses/Independent-modules-exception +0 -0
meta/files/common-licenses/exceptions/KiCad-libraries-exception renamed from meta/files/common-licenses/KiCad-libraries-exception +0 -0
meta/files/common-licenses/exceptions/LGPL-3.0-linking-exception renamed from meta/files/common-licenses/LGPL-3.0-linking-exception +0 -0
meta/files/common-licenses/exceptions/LLGPL renamed from meta/files/common-licenses/LLGPL +0 -0
meta/files/common-licenses/exceptions/LLVM-exception renamed from meta/files/common-licenses/LLVM-exception +0 -0
meta/files/common-licenses/exceptions/LZMA-exception renamed from meta/files/common-licenses/LZMA-exception +0 -0
meta/files/common-licenses/exceptions/Libtool-exception renamed from meta/files/common-licenses/Libtool-exception +0 -0
meta/files/common-licenses/exceptions/Linux-syscall-note renamed from meta/files/common-licenses/Linux-syscall-note +0 -0
meta/files/common-licenses/exceptions/OCCT-exception-1.0 renamed from meta/files/common-licenses/OCCT-exception-1.0 +0 -0
meta/files/common-licenses/exceptions/OCaml-LGPL-linking-exception renamed from meta/files/common-licenses/OCaml-LGPL-linking-exception +0 -0
meta/files/common-licenses/exceptions/OpenJDK-assembly-exception-1.0 renamed from meta/files/common-licenses/OpenJDK-assembly-exception-1.0 +0 -0
meta/files/common-licenses/exceptions/PCRE2-exception renamed from meta/files/common-licenses/PCRE2-exception +0 -0
meta/files/common-licenses/exceptions/PS-or-PDF-font-exception-20170817 renamed from meta/files/common-licenses/PS-or-PDF-font-exception-20170817 +0 -0
meta/files/common-licenses/exceptions/QPL-1.0-INRIA-2004-exception renamed from meta/files/common-licenses/QPL-1.0-INRIA-2004-exception +0 -0
meta/files/common-licenses/exceptions/Qt-GPL-exception-1.0 renamed from meta/files/common-licenses/Qt-GPL-exception-1.0 +0 -0
meta/files/common-licenses/exceptions/Qt-LGPL-exception-1.1 renamed from meta/files/common-licenses/Qt-LGPL-exception-1.1 +0 -0
meta/files/common-licenses/exceptions/Qwt-exception-1.0 renamed from meta/files/common-licenses/Qwt-exception-1.0 +0 -0
meta/files/common-licenses/exceptions/RRDtool-FLOSS-exception-2.0 renamed from meta/files/common-licenses/RRDtool-FLOSS-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/SANE-exception renamed from meta/files/common-licenses/SANE-exception +0 -0
meta/files/common-licenses/exceptions/SHL-2.0 renamed from meta/files/common-licenses/SHL-2.0 +0 -0
meta/files/common-licenses/exceptions/SHL-2.1 renamed from meta/files/common-licenses/SHL-2.1 +0 -0
meta/files/common-licenses/exceptions/SWI-exception renamed from meta/files/common-licenses/SWI-exception +0 -0
meta/files/common-licenses/exceptions/Simple-Library-Usage-exception renamed from meta/files/common-licenses/Simple-Library-Usage-exception +0 -0
meta/files/common-licenses/exceptions/Swift-exception renamed from meta/files/common-licenses/Swift-exception +0 -0
meta/files/common-licenses/exceptions/Texinfo-exception renamed from meta/files/common-licenses/Texinfo-exception +0 -0
meta/files/common-licenses/exceptions/UBDL-exception renamed from meta/files/common-licenses/UBDL-exception +0 -0
meta/files/common-licenses/exceptions/Universal-FOSS-exception-1.0 renamed from meta/files/common-licenses/Universal-FOSS-exception-1.0 +0 -0
meta/files/common-licenses/exceptions/WxWindows-exception-3.1 renamed from meta/files/common-licenses/WxWindows-exception-3.1 +0 -0
meta/files/common-licenses/exceptions/cryptsetup-OpenSSL-exception renamed from meta/files/common-licenses/cryptsetup-OpenSSL-exception +0 -0
meta/files/common-licenses/exceptions/eCos-exception-2.0 renamed from meta/files/common-licenses/eCos-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/erlang-otp-linking-exception renamed from meta/files/common-licenses/erlang-otp-linking-exception +0 -0
meta/files/common-licenses/exceptions/fmt-exception renamed from meta/files/common-licenses/fmt-exception +0 -0
meta/files/common-licenses/exceptions/freertos-exception-2.0 renamed from meta/files/common-licenses/freertos-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/gnu-javamail-exception renamed from meta/files/common-licenses/gnu-javamail-exception +0 -0
meta/files/common-licenses/exceptions/harbour-exception renamed from meta/files/common-licenses/harbour-exception +0 -0
meta/files/common-licenses/exceptions/i2p-gpl-java-exception renamed from meta/files/common-licenses/i2p-gpl-java-exception +0 -0
meta/files/common-licenses/exceptions/kvirc-openssl-exception renamed from meta/files/common-licenses/kvirc-openssl-exception +0 -0
meta/files/common-licenses/exceptions/libpri-OpenH323-exception renamed from meta/files/common-licenses/libpri-OpenH323-exception +0 -0
meta/files/common-licenses/exceptions/mif-exception renamed from meta/files/common-licenses/mif-exception +0 -0
meta/files/common-licenses/exceptions/mxml-exception renamed from meta/files/common-licenses/mxml-exception +0 -0
meta/files/common-licenses/exceptions/openvpn-openssl-exception renamed from meta/files/common-licenses/openvpn-openssl-exception +0 -0
meta/files/common-licenses/exceptions/polyparse-exception renamed from meta/files/common-licenses/polyparse-exception +0 -0
meta/files/common-licenses/exceptions/romic-exception renamed from meta/files/common-licenses/romic-exception +0 -0
meta/files/common-licenses/exceptions/rsync-linking-exception renamed from meta/files/common-licenses/rsync-linking-exception +0 -0
meta/files/common-licenses/exceptions/sqlitestudio-OpenSSL-exception renamed from meta/files/common-licenses/sqlitestudio-OpenSSL-exception +0 -0
meta/files/common-licenses/exceptions/stunnel-exception renamed from meta/files/common-licenses/stunnel-exception +0 -0
meta/files/common-licenses/exceptions/u-boot-exception-2.0 renamed from meta/files/common-licenses/u-boot-exception-2.0 +0 -0
meta/files/common-licenses/exceptions/vsftpd-openssl-exception renamed from meta/files/common-licenses/vsftpd-openssl-exception +0 -0
meta/files/common-licenses/exceptions/x11vnc-openssl-exception renamed from meta/files/common-licenses/x11vnc-openssl-exception +0 -0
meta/lib/oe/license.py +6 -0
@@ -454,6 +454,12 @@ def get_license_path(d, node): return d.expand("${S}/" + filename), filename for lic_dir in [d.getVar("COMMON_LICENSE_DIR")] + (d.getVar("LICENSE_PATH") or "").split(): + if isinstance(node, oe.spdx_license.ExceptionId): + p = os.path.join(lic_dir, "exceptions", node.name) + if os.path.isfile(p): + return p, None + return None, None + p = os.path.join(lic_dir, node.name) if os.path.isfile(p): return p, None
scripts/pull-spdx-licenses.py +1 -1
@@ -72,7 +72,7 @@ def update_exceptions(dest, version, overwrite, deprecated): print(f"[{idx + 1} of {total_count}] ", end="") - dest_license_file = dest / lic_id + dest_license_file = dest / "exceptions" / lic_id if dest_license_file.is_file() and not overwrite: print(f"Skipping {lic_id} since it already exists") continue
Signature · 1 line
2.55.0
Quoted 10 lines · Joshua Watt via lists.openembedded.org
Moves the SPDX license exceptions to a subdirectory to make the easier to identify as license exceptions vs. actual licenses
This should have no effect on other layers since SPDX doesn't allow custom Exceptions like it does for Licenses (via LicenseRef-); since we have already enumerated all known exceptions, its unlikely any other layer have added their own
Signed-off-by Joshua Watt <[email protected]>---
Hi Joshua,
Thanks for your patch.
It looks like this is breaking devtool/recipetool:
Traceback (most recent call last):
File "/srv/pokybuild/yocto-worker/qemux86/build/layers/openembedded-core/meta/lib/oeqa/sdkext/cases/devtool.py", line 59, in test_devtool_add_reset
self._run('devtool add myapp %s' % self.myapp_dst)
File "/srv/pokybuild/yocto-worker/qemux86/build/layers/openembedded-core/meta/lib/oeqa/sdkext/case.py", line 22, in _run
return subprocess.check_output(". %s > /dev/null;"\
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib64/python3.12/subprocess.py", line 466, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.12/subprocess.py", line 571, in run
raise CalledProcessError(retcode, process.args,
oeqa.utils.subprocesstweak.OETestCalledProcessError: Command '. /srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/environment-setup-core2-32-poky-linux > /dev/null; devtool add myapp /srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/myapp;' returned non-zero exit status 1. Standard Output: NOTE: Reconnecting to bitbake server...
NOTE: Reconnecting to bitbake server...
Traceback (most recent call last):
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/recipetool", line 111, in <module>
ret = main()
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/recipetool", line 100, in main
ret = args.func(args)
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/lib/recipetool/create.py", line 798, in create_recipe
handle_license_vars(srctree_use, lines_before, handled, extravalues, tinfoil.config_data)
~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/lib/recipetool/create.py", line 965, in handle_license_vars
for node, licfile, md5 in find_licenses(srctree, d):
~~~~~~~~~~~~~^^^^^^^^^^^^
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 201, in find_licenses
licenses = match_licenses(licfiles, srctree, d, extra_hashes)
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 173, in match_licenses
md5sums.update(_crunch_known_licenses(d))
~~~~~~~~~~~~~~~~~~~~~~^^^ File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 52, in _crunch_known_licenses
md5value = bb.utils.md5_file(path)
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/bitbake/lib/bb/utils.py", line 648, in md5_file
return _hasher(sig, filename)
File "/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/bitbake/lib/bb/utils.py", line 623, in _hasher
with open(filename, "rb") as f:
~~~~^^^^^^^^^^^^^^^^
IsADirectoryError: [Errno 21] Is a directory: '/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/files/common-licenses/exceptions'
https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/4408
https://autobuilder.yoctoproject.org/valkyrie/#/builders/16/builds/4463
https://autobuilder.yoctoproject.org/valkyrie/#/builders/36/builds/4420
https://autobuilder.yoctoproject.org/valkyrie/#/builders/45/builds/2154
https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/4537
Everything else looks fine here. Can you have a look at that?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 87 lines · Mathieu Dubois-Briand
Quoted 10 lines · Joshua Watt via lists.openembedded.org
Moves the SPDX license exceptions to a subdirectory to make the easier to identify as license exceptions vs. actual licenses
This should have no effect on other layers since SPDX doesn't allow custom Exceptions like it does for Licenses (via LicenseRef-); since we have already enumerated all known exceptions, its unlikely any other layer have added their own
Signed-off-by Joshua Watt <[email protected]>---
Hi Joshua,
Thanks for your patch.
It looks like this is breaking devtool/recipetool:
Traceback (most recent call last):
File
"/srv/pokybuild/yocto-worker/qemux86/build/layers/openembedded-core/meta/lib/oeqa/sdkext/cases/devtool.py", line 59, intest_devtool_add_reset
self._run('devtool add myapp %s' % self.myapp_dst)
File
"/srv/pokybuild/yocto-worker/qemux86/build/layers/openembedded-core/meta/lib/oeqa/sdkext/case.py", line 22, in_runreturn subprocess.check_output(". %s > /dev/null;"\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^File "
/usr/lib64/python3.12/subprocess.py", line 466, incheck_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.12/subprocess.py", line 571, in run
raise CalledProcessError(retcode, process.args,
oeqa.utils.subprocesstweak.OETestCalledProcessError: Command './srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/environment-setup-core2-32-poky-linuxQuoted 1 line
/dev/null; devtool add myapp
/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/myapp;'
returned non-zero exit status 1.
Standard Output: NOTE: Reconnecting to bitbake server...
NOTE: Reconnecting to bitbake server...
Traceback (most recent call last):
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/recipetool", line 111, in <module>
ret =main()
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/recipetool", line 100, in main
ret =args.func(args)
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/lib/recipetool/create.py", line 798, increate_recipe
handle_license_vars(srctree_use,lines_before, handled, extravalues,
tinfoil.config_data)~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/scripts/lib/recipetool/create.py", line 965, inhandle_license_vars
for node, licfile, md5 infind_licenses(srctree, d):
~~~~~~~~~~~~~^^^^^^^^^^^^
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 201, infind_licenses
licenses =match_licenses(licfiles, srctree, d, extra_hashes)
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 173, inmatch_licensesmd5sums.update(_crunch_known_licenses(d)) ~~~~~~~~~~~~~~~~~~~~~~^^^File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/lib/oe/license_finder.py", line 52, in_crunch_known_licenses
md5value =bb.utils.md5_file(path)
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/bitbake/lib/bb/utils.py", line 648, inmd5_file
return_hasher(sig, filename)
File
"/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/bitbake/lib/bb/utils.py", line 623, in_hasher
withopen(filename, "rb")as f:
~~~~^^^^^^^^^^^^^^^^
IsADirectoryError: [Errno 21] Is a directory:
'/srv/pokybuild/yocto-worker/qemux86/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0/testsdkext/layers/openembedded-core/meta/files/common-licenses/exceptions'
Quoted 8 lines
https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/4408
https://autobuilder.yoctoproject.org/valkyrie/#/builders/16/builds/4463
https://autobuilder.yoctoproject.org/valkyrie/#/builders/36/builds/4420
https://autobuilder.yoctoproject.org/valkyrie/#/builders/45/builds/2154
https://autobuilder.yoctoproject.org/valkyrie/#/builders/68/builds/4537Everything else looks fine here. Can you have a look at that?
Yes
Quoted 10 lines
Thanks,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com