aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-selftest/recipes-test/logging-test/logging-test.bb24
-rw-r--r--meta-selftest/wic/test_efi_plugin.wks6
-rw-r--r--meta-skeleton/recipes-kernel/hello-mod/files/hello.c10
-rw-r--r--meta/classes/archiver.bbclass8
-rw-r--r--meta/classes/autotools.bbclass5
-rw-r--r--meta/classes/baremetal-image.bbclass10
-rw-r--r--meta/classes/base.bbclass52
-rw-r--r--meta/classes/buildhistory.bbclass24
-rw-r--r--meta/classes/cpan-base.bbclass2
-rw-r--r--meta/classes/create-spdx.bbclass39
-rw-r--r--meta/classes/cross-canadian.bbclass4
-rw-r--r--meta/classes/cross.bbclass4
-rw-r--r--meta/classes/devshell.bbclass10
-rw-r--r--meta/classes/externalsrc.bbclass9
-rw-r--r--meta/classes/image-artifact-names.bbclass9
-rw-r--r--meta/classes/image-prelink.bbclass13
-rw-r--r--meta/classes/image.bbclass20
-rw-r--r--meta/classes/image_types_wic.bbclass39
-rw-r--r--meta/classes/insane.bbclass186
-rw-r--r--meta/classes/kernel-fitimage.bbclass306
-rw-r--r--meta/classes/kernel-yocto.bbclass5
-rw-r--r--meta/classes/kernel.bbclass44
-rw-r--r--meta/classes/libc-package.bbclass2
-rw-r--r--meta/classes/license.bbclass24
-rw-r--r--meta/classes/license_image.bbclass11
-rw-r--r--meta/classes/meta.bbclass4
-rw-r--r--meta/classes/mirrors.bbclass1
-rw-r--r--meta/classes/multilib.bbclass5
-rw-r--r--meta/classes/nativesdk.bbclass2
-rw-r--r--meta/classes/npm.bbclass27
-rw-r--r--meta/classes/package.bbclass40
-rw-r--r--meta/classes/package_deb.bbclass5
-rw-r--r--meta/classes/package_ipk.bbclass8
-rw-r--r--meta/classes/package_rpm.bbclass8
-rw-r--r--meta/classes/patch.bbclass7
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/classes/ptest.bbclass2
-rw-r--r--meta/classes/python3-dir.bbclass2
-rw-r--r--meta/classes/reproducible_build.bbclass127
-rw-r--r--meta/classes/reproducible_build_simple.bbclass9
-rw-r--r--meta/classes/rm_work.bbclass8
-rw-r--r--meta/classes/rootfs-postcommands.bbclass4
-rw-r--r--meta/classes/rust-common.bbclass17
-rw-r--r--meta/classes/siteinfo.bbclass34
-rw-r--r--meta/classes/sstate.bbclass92
-rw-r--r--meta/classes/staging.bbclass1
-rw-r--r--meta/classes/testimage.bbclass21
-rw-r--r--meta/classes/toolchain-scripts.bbclass5
-rw-r--r--meta/classes/uboot-config.bbclass2
-rw-r--r--meta/classes/uboot-sign.bbclass56
-rw-r--r--meta/classes/useradd.bbclass4
-rw-r--r--meta/classes/utils.bbclass35
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf29
-rw-r--r--meta/conf/distro/include/default-distrovars.inc6
-rw-r--r--meta/conf/distro/include/default-versions.inc2
-rw-r--r--meta/conf/distro/include/maintainers.inc9
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc2
-rw-r--r--meta/conf/distro/include/rust_versions.inc13
-rw-r--r--meta/conf/distro/include/tcmode-default.inc17
-rw-r--r--meta/conf/documentation.conf4
-rw-r--r--meta/conf/layer.conf12
-rw-r--r--meta/conf/machine/include/mips/feature-mips-mips16e.inc2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/include/x86/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarm.conf4
-rw-r--r--meta/conf/machine/qemuarm64.conf4
-rw-r--r--meta/conf/machine/qemuarmv5.conf5
-rw-r--r--meta/conf/multilib.conf2
-rw-r--r--meta/files/rust-ccld-wrapper.c29
-rw-r--r--meta/files/spdx-licenses.json2565
-rw-r--r--meta/lib/buildstats.py4
-rw-r--r--meta/lib/oe/gpg_sign.py27
-rw-r--r--meta/lib/oe/license.py6
-rw-r--r--meta/lib/oe/maketype.py7
-rw-r--r--meta/lib/oe/package_manager/__init__.py2
-rw-r--r--meta/lib/oe/packagedata.py2
-rw-r--r--meta/lib/oe/qa.py34
-rw-r--r--meta/lib/oe/reproducible.py84
-rw-r--r--meta/lib/oe/rootfs.py2
-rw-r--r--meta/lib/oe/spdx.py64
-rw-r--r--meta/lib/oe/sstatesig.py81
-rw-r--r--meta/lib/oe/utils.py3
-rw-r--r--meta/lib/oeqa/core/target/ssh.py4
-rw-r--r--meta/lib/oeqa/manual/eclipse-plugin.json6
-rw-r--r--meta/lib/oeqa/runtime/cases/rpm.py6
-rw-r--r--meta/lib/oeqa/sdk/buildtools-cases/build.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/bblogging.py104
-rw-r--r--meta/lib/oeqa/selftest/cases/bbtests.py7
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/eSDK.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/fitimage.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/gotoolchain.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/oescripts.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/signing.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py36
-rw-r--r--meta/lib/oeqa/selftest/cases/tinfoil.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py29
-rw-r--r--meta/lib/oeqa/selftest/context.py2
-rw-r--r--meta/lib/oeqa/utils/buildproject.py3
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
-rw-r--r--meta/lib/oeqa/utils/targetbuild.py4
-rw-r--r--meta/recipes-bsp/acpid/acpid.inc6
-rw-r--r--meta/recipes-bsp/acpid/acpid_2.0.33.bb (renamed from meta/recipes-bsp/acpid/acpid_2.0.32.bb)3
-rw-r--r--meta/recipes-bsp/apmd/apmd_3.2.2-15.bb6
-rw-r--r--meta/recipes-bsp/opensbi/opensbi-payloads.inc10
-rw-r--r--meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch41
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common.inc2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb4
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc6
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2021.10.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2021.07.bb)1
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.8.bb4
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/0001-avoid-start-failure-with-bind-user.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/0001-named-lwresd-V-and-start-log-hide-build-options.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/0001-named-lwresd-V-and-start-log-hide-build-options.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/bind-ensure-searching-for-json-headers-searches-sysr.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/bind-ensure-searching-for-json-headers-searches-sysr.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/bind9 (renamed from meta/recipes-connectivity/bind/bind-9.16.20/bind9)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/conf.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/conf.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/generate-rndc-key.sh (renamed from meta/recipes-connectivity/bind/bind-9.16.20/generate-rndc-key.sh)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/init.d-add-support-for-read-only-rootfs.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/init.d-add-support-for-read-only-rootfs.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/make-etc-initd-bind-stop-work.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.20/make-etc-initd-bind-stop-work.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.21/named.service (renamed from meta/recipes-connectivity/bind/bind-9.16.20/named.service)0
-rw-r--r--meta/recipes-connectivity/bind/bind_9.16.21.bb (renamed from meta/recipes-connectivity/bind/bind_9.16.20.bb)8
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch48
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.62.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.61.bb)2
-rw-r--r--meta/recipes-connectivity/connman/connman.inc8
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb4
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch12
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_2.2.bb (renamed from meta/recipes-connectivity/inetutils/inetutils_2.1.bb)2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_5.14.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb)2
-rw-r--r--meta/recipes-connectivity/kea/files/0001-add-missing-headers-in-timer_mgr.cc.patch29
-rw-r--r--meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch24
-rw-r--r--meta/recipes-connectivity/kea/files/0001-include-limits.h.patch35
-rw-r--r--meta/recipes-connectivity/kea/files/0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch39
-rw-r--r--meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch7
-rw-r--r--meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch54
-rw-r--r--meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch27
-rw-r--r--meta/recipes-connectivity/kea/kea_2.0.0.bb (renamed from meta/recipes-connectivity/kea/kea_1.8.2.bb)8
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb18
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.33.bb (renamed from meta/recipes-connectivity/ofono/ofono_1.32.bb)4
-rw-r--r--meta/recipes-connectivity/openssh/openssh_8.8p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_8.7p1.bb)14
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch36
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch21
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch46
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0003-Add-support-for-io_pgetevents_time64-syscall.patch62
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0004-Fixup-support-for-io_pgetevents_time64-syscall.patch99
-rw-r--r--meta/recipes-connectivity/openssl/openssl/reproducible.patch32
-rw-r--r--meta/recipes-connectivity/openssl/openssl/run-ptest2
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.0.0.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.1.1l.bb)86
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.9.bb8
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb4
-rw-r--r--meta/recipes-core/busybox/busybox-inittab_1.34.1.bb (renamed from meta/recipes-core/busybox/busybox-inittab_1.34.0.bb)0
-rw-r--r--meta/recipes-core/busybox/busybox.inc24
-rw-r--r--meta/recipes-core/busybox/busybox_1.34.1.bb (renamed from meta/recipes-core/busybox/busybox_1.34.0.bb)2
-rw-r--r--meta/recipes-core/coreutils/coreutils/0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch167
-rw-r--r--meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch99
-rw-r--r--meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch49
-rw-r--r--meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch93
-rw-r--r--meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch7
-rw-r--r--meta/recipes-core/coreutils/coreutils_9.0.bb (renamed from meta/recipes-core/coreutils/coreutils_8.32.bb)11
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc10
-rw-r--r--meta/recipes-core/ell/ell_0.44.bb (renamed from meta/recipes-core/ell/ell_0.43.bb)2
-rw-r--r--meta/recipes-core/expat/expat_2.4.1.bb6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch26
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch8
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/time-test.patch40
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb)3
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc5
-rw-r--r--meta/recipes-core/glib-networking/glib-networking_2.70.0.bb (renamed from meta/recipes-core/glib-networking/glib-networking_2.68.2.bb)2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc9
-rw-r--r--meta/recipes-core/glibc/glibc-tests.inc32
-rw-r--r--meta/recipes-core/glibc/glibc-testsuite_2.34.bb37
-rw-r--r--meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch2
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb4
-rw-r--r--meta/recipes-core/images/core-image-ptest-all.bb4
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb)0
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt.inc4
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb)0
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.12.bb2
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb1
-rw-r--r--meta/recipes-core/meta/meta-environment.bb5
-rw-r--r--meta/recipes-core/meta/meta-ide-support.bb8
-rw-r--r--meta/recipes-core/meta/testexport-tarball.bb1
-rw-r--r--meta/recipes-core/meta/uninative-tarball.bb1
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb11
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb1
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb6
-rw-r--r--meta/recipes-core/systemd/systemd-boot_249.5.bb (renamed from meta/recipes-core/systemd/systemd-boot_249.3.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb2
-rw-r--r--meta/recipes-core/systemd/systemd-conf_1.0.bb6
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty.bb18
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch46
-rw-r--r--meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch8
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch15
-rw-r--r--meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch18
-rw-r--r--meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch8
-rw-r--r--meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch2
-rw-r--r--meta/recipes-core/systemd/systemd_249.5.bb (renamed from meta/recipes-core/systemd/systemd_249.3.bb)80
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_3.00.bb (renamed from meta/recipes-core/sysvinit/sysvinit_2.99.bb)2
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.37.2.bb7
-rwxr-xr-xmeta/recipes-core/volatile-binds/files/mount-copybind26
-rw-r--r--meta/recipes-core/volatile-binds/volatile-binds.bb6
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc2
-rw-r--r--meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch62
-rw-r--r--meta/recipes-devtools/bison/bison_3.8.2.bb (renamed from meta/recipes-devtools/bison/bison_3.7.6.bb)7
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb8
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_5.14.2.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb)4
-rw-r--r--meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb6
-rw-r--r--meta/recipes-devtools/cargo/cargo-cross-canadian_1.55.0.bb6
-rw-r--r--meta/recipes-devtools/cargo/cargo.inc4
-rw-r--r--meta/recipes-devtools/cargo/cargo_1.54.0.bb4
-rw-r--r--meta/recipes-devtools/cargo/cargo_1.55.0.bb4
-rw-r--r--meta/recipes-devtools/ccache/ccache_4.4.2.bb (renamed from meta/recipes-devtools/ccache/ccache_4.4.bb)4
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.21.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.21.1.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.21.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.21.1.bb)0
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c_0.17.6.bb (renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb)2
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.4.bb6
-rw-r--r--meta/recipes-devtools/dnf/dnf_4.9.0.bb (renamed from meta/recipes-devtools/dnf/dnf_4.8.0.bb)2
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.185.bb1
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc2
-rw-r--r--meta/recipes-devtools/git/git_2.33.1.bb (renamed from meta/recipes-devtools/git/git_2.33.0.bb)5
-rw-r--r--meta/recipes-devtools/go/go-1.16.8.inc (renamed from meta/recipes-devtools/go/go-1.16.7.inc)4
-rw-r--r--meta/recipes-devtools/go/go-binary-native_1.16.8.bb (renamed from meta/recipes-devtools/go/go-binary-native_1.16.7.bb)4
-rw-r--r--meta/recipes-devtools/go/go-cross-canadian_1.16.8.bb (renamed from meta/recipes-devtools/go/go-cross-canadian_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/go/go-cross_1.16.8.bb (renamed from meta/recipes-devtools/go/go-cross_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/go/go-crosssdk_1.16.8.bb (renamed from meta/recipes-devtools/go/go-crosssdk_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/go/go-native_1.16.8.bb (renamed from meta/recipes-devtools/go/go-native_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/go/go-runtime_1.16.8.bb (renamed from meta/recipes-devtools/go/go-runtime_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/go/go_1.16.8.bb (renamed from meta/recipes-devtools/go/go_1.16.7.bb)0
-rw-r--r--meta/recipes-devtools/help2man/help2man_1.48.5.bb (renamed from meta/recipes-devtools/help2man/help2man_1.48.4.bb)2
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_0.1.18.bb (renamed from meta/recipes-devtools/libcomps/libcomps_0.1.17.bb)2
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch34
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch37
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.64.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.63.1.bb)4
-rw-r--r--meta/recipes-devtools/libedit/libedit_20210910-3.1.bb (renamed from meta/recipes-devtools/libedit/libedit_20210714-3.1.bb)2
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb2
-rw-r--r--meta/recipes-devtools/librepo/librepo_1.14.2.bb (renamed from meta/recipes-devtools/librepo/librepo_1.14.1.bb)2
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.6.inc1
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.6.bb2
-rw-r--r--meta/recipes-devtools/lua/lua/lua.pc.in10
-rw-r--r--meta/recipes-devtools/lua/lua/run-ptest19
-rw-r--r--meta/recipes-devtools/lua/lua_5.4.3.bb62
-rw-r--r--meta/recipes-devtools/meson/meson.inc6
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch20
-rw-r--r--meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch26
-rw-r--r--meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch41
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch94
-rw-r--r--meta/recipes-devtools/meson/meson/gi-target-dep.patch41
-rw-r--r--meta/recipes-devtools/meson/meson_0.59.2.bb (renamed from meta/recipes-devtools/meson/meson_0.58.1.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb)0
-rw-r--r--meta/recipes-devtools/perl/files/CVE-2021-36770.patch40
-rw-r--r--meta/recipes-devtools/perl/perl_5.34.0.bb10
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb2
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb2
-rw-r--r--meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch4
-rw-r--r--meta/recipes-devtools/python/python3-dbusmock_0.24.0.bb (renamed from meta/recipes-devtools/python/python3-dbusmock_0.23.1.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-git_3.1.24.bb (renamed from meta/recipes-devtools/python/python3-git_3.1.20.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-hypothesis_6.23.2.bb (renamed from meta/recipes-devtools/python/python3-hypothesis_6.15.0.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-importlib-metadata_4.8.1.bb (renamed from meta/recipes-devtools/python/python3-importlib-metadata_4.6.4.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-jinja2_3.0.2.bb (renamed from meta/recipes-devtools/python/python3-jinja2_3.0.1.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-more-itertools_8.10.0.bb (renamed from meta/recipes-devtools/python/python3-more-itertools_8.8.0.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-packaging_21.0.bb6
-rw-r--r--meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch37
-rw-r--r--meta/recipes-devtools/python/python3-pip_21.3.bb (renamed from meta/recipes-devtools/python/python3-pip_21.2.4.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-pycryptodome_3.10.1.bb5
-rw-r--r--meta/recipes-devtools/python/python3-pycryptodome_3.11.0.bb5
-rw-r--r--meta/recipes-devtools/python/python3-pycryptodomex_3.11.0.bb (renamed from meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-pygobject_3.42.0.bb (renamed from meta/recipes-devtools/python/python3-pygobject_3.40.1.bb)2
-rw-r--r--meta/recipes-devtools/python/python3-pytest/0001-Allow-pluggy-1.0.patch65
-rw-r--r--meta/recipes-devtools/python/python3-pytest_6.2.5.bb (renamed from meta/recipes-devtools/python/python3-pytest_6.2.4.bb)3
-rw-r--r--meta/recipes-devtools/python/python3-setuptools-scm_6.3.2.bb (renamed from meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb)16
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_58.2.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_57.4.0.bb)48
-rw-r--r--meta/recipes-devtools/python/python3-smmap_4.0.0.bb3
-rw-r--r--meta/recipes-devtools/python/python3-smmap_5.0.0.bb (renamed from meta/recipes-devtools/python/python-smmap.inc)4
-rw-r--r--meta/recipes-devtools/python/python3-tomli_1.2.1.bb20
-rw-r--r--meta/recipes-devtools/python/python3-zipp_3.6.0.bb (renamed from meta/recipes-devtools/python/python3-zipp_3.5.0.bb)2
-rw-r--r--meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch6
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch49
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch35
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch34
-rw-r--r--meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch24
-rw-r--r--meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch15
-rw-r--r--meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch30
-rw-r--r--meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch14
-rw-r--r--meta/recipes-devtools/python/python3/makerace.patch25
-rw-r--r--meta/recipes-devtools/python/python3/reformat_sysconfig.py2
-rw-r--r--meta/recipes-devtools/python/python3_3.10.0.bb (renamed from meta/recipes-devtools/python/python3_3.9.6.bb)41
-rw-r--r--meta/recipes-devtools/qemu/qemu-native_6.1.0.bb (renamed from meta/recipes-devtools/qemu/qemu-native_6.0.0.bb)2
-rw-r--r--meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb (renamed from meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb)5
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc22
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch29
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch50
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch35
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch43
-rw-r--r--meta/recipes-devtools/qemu/qemu/0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch41
-rw-r--r--meta/recipes-devtools/qemu/qemu/0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch48
-rw-r--r--meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch34
-rw-r--r--meta/recipes-devtools/qemu/qemu/0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch50
-rw-r--r--meta/recipes-devtools/qemu/qemu/0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch58
-rw-r--r--meta/recipes-devtools/qemu/qemu/0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch49
-rw-r--r--meta/recipes-devtools/qemu/qemu/0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch49
-rw-r--r--meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch87
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch42
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch59
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2021-3682.patch41
-rw-r--r--meta/recipes-devtools/qemu/qemu/cross.patch40
-rw-r--r--meta/recipes-devtools/qemu/qemu_6.1.0.bb (renamed from meta/recipes-devtools/qemu/qemu_6.0.0.bb)0
-rw-r--r--meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb1
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch14
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch22
-rw-r--r--meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch28
-rw-r--r--meta/recipes-devtools/rpm/files/0001-docs-do-not-build-manpages-requires-pandoc.patch26
-rw-r--r--meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch65
-rw-r--r--meta/recipes-devtools/rpm/files/0001-tools-Add-error.h-for-non-glibc-case.patch59
-rw-r--r--meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch33
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.17.0.bb (renamed from meta/recipes-devtools/rpm/rpm_4.16.1.3.bb)28
-rw-r--r--meta/recipes-devtools/ruby/ruby.inc5
-rw-r--r--meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch35
-rw-r--r--meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch28
-rw-r--r--meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch28
-rw-r--r--meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch67
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.0.2.bb4
-rw-r--r--meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb6
-rw-r--r--meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch (renamed from meta/recipes-devtools/rust/libstd-rs-1.54.0/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch)0
-rw-r--r--meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch (renamed from meta/recipes-devtools/rust/libstd-rs-1.54.0/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch)0
-rw-r--r--meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch (renamed from meta/recipes-devtools/rust/libstd-rs-1.54.0/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch)0
-rw-r--r--meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch (renamed from meta/recipes-devtools/rust/libstd-rs-1.54.0/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch)0
-rw-r--r--meta/recipes-devtools/rust/libstd-rs_1.55.0.bb (renamed from meta/recipes-devtools/rust/libstd-rs_1.54.0.bb)2
-rw-r--r--meta/recipes-devtools/rust/rust-common.inc58
-rw-r--r--meta/recipes-devtools/rust/rust-cross-canadian_1.55.0.bb (renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb)4
-rw-r--r--meta/recipes-devtools/rust/rust-cross.inc6
-rw-r--r--meta/recipes-devtools/rust/rust-cross_1.54.0.bb2
-rw-r--r--meta/recipes-devtools/rust/rust-cross_1.55.0.bb2
-rw-r--r--meta/recipes-devtools/rust/rust-llvm.inc5
-rw-r--r--meta/recipes-devtools/rust/rust-llvm_1.55.0.bb (renamed from meta/recipes-devtools/rust/rust-llvm_1.54.0.bb)2
-rw-r--r--meta/recipes-devtools/rust/rust-snapshot-1.54.0.inc18
-rw-r--r--meta/recipes-devtools/rust/rust-snapshot.inc16
-rw-r--r--meta/recipes-devtools/rust/rust-source-1.54.0.inc3
-rw-r--r--meta/recipes-devtools/rust/rust-source.inc1
-rw-r--r--meta/recipes-devtools/rust/rust-tools-cross-canadian_1.55.0.bb (renamed from meta/recipes-devtools/rust/rust-tools-cross-canadian_1.54.0.bb)4
-rw-r--r--meta/recipes-devtools/rust/rust.inc1
-rw-r--r--meta/recipes-devtools/rust/rust_1.55.0.bb (renamed from meta/recipes-devtools/rust/rust_1.54.0.bb)4
-rw-r--r--meta/recipes-devtools/strace/strace/ptest-sleep.patch7
-rw-r--r--meta/recipes-devtools/strace/strace/uintptr_t.patch27
-rw-r--r--meta/recipes-devtools/strace/strace_5.14.bb (renamed from meta/recipes-devtools/strace/strace_5.13.bb)5
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb1
-rw-r--r--meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb2
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch56
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_git.bb9
-rw-r--r--meta/recipes-devtools/vala/vala_0.54.2.bb (renamed from meta/recipes-devtools/vala/vala_0.52.5.bb)2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch72
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-swapcontext-Add-SIGALRM-handler-to-avoid-s.patch65
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch20
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch47
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch12
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch34
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch171
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch43
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch1422
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.18.1.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.17.0.bb)9
-rw-r--r--meta/recipes-extended/acpica/acpica_20210930.bb (renamed from meta/recipes-extended/acpica/acpica_20210730.bb)2
-rw-r--r--meta/recipes-extended/asciidoc/asciidoc_9.1.1.bb (renamed from meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb)2
-rw-r--r--meta/recipes-extended/at/at_3.2.2.bb6
-rw-r--r--meta/recipes-extended/bash/bash.inc5
-rw-r--r--meta/recipes-extended/bzip2/bzip2/Makefile.am2
-rw-r--r--meta/recipes-extended/cronie/cronie_1.5.7.bb6
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch6
-rw-r--r--meta/recipes-extended/ethtool/ethtool_5.14.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.13.bb)2
-rw-r--r--meta/recipes-extended/findutils/findutils.inc6
-rw-r--r--meta/recipes-extended/findutils/findutils/run-ptest57
-rw-r--r--meta/recipes-extended/findutils/findutils_4.8.0.bb12
-rw-r--r--meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch47
-rw-r--r--meta/recipes-extended/gawk/gawk/test-time.patch22
-rw-r--r--meta/recipes-extended/gawk/gawk_5.1.0.bb1
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.54.0.bb)6
-rw-r--r--meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch)0
-rw-r--r--meta/recipes-extended/gzip/gzip_1.11.bb (renamed from meta/recipes-extended/gzip/gzip_1.10.bb)3
-rw-r--r--meta/recipes-extended/iputils/iputils_20210722.bb6
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.5.2.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.5.1.bb)2
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.7.20.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.7.19.bb)4
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch27
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch38
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb)10
-rw-r--r--meta/recipes-extended/lsof/files/lsof-remove-host-information.patch17
-rw-r--r--meta/recipes-extended/lsof/lsof_4.94.0.bb (renamed from meta/recipes-extended/lsof/lsof_4.91.bb)28
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch12
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch59
-rw-r--r--meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch36
-rw-r--r--meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch37
-rw-r--r--meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch58
-rw-r--r--meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch60
-rw-r--r--meta/recipes-extended/ltp/ltp_20210927.bb (renamed from meta/recipes-extended/ltp/ltp_20210524.bb)17
-rw-r--r--meta/recipes-extended/man-db/man-db_2.9.4.bb2
-rw-r--r--meta/recipes-extended/man-pages/man-pages_5.13.bb (renamed from meta/recipes-extended/man-pages/man-pages_5.12.bb)2
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb2
-rw-r--r--meta/recipes-extended/msmtp/msmtp_1.8.17.bb (renamed from meta/recipes-extended/msmtp/msmtp_1.8.15.bb)2
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.21.bb2
-rw-r--r--meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch28
-rw-r--r--meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch28
-rw-r--r--meta/recipes-extended/pam/libpam_1.5.2.bb (renamed from meta/recipes-extended/pam/libpam_1.5.1.bb)9
-rw-r--r--meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb (renamed from meta/recipes-extended/perl/libconvert-asn1-perl_0.31.bb)3
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb2
-rw-r--r--meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch25
-rw-r--r--meta/recipes-extended/sudo/sudo.inc16
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.8p2.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.7p2.bb)3
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc6
-rw-r--r--meta/recipes-extended/tar/tar_1.34.bb6
-rw-r--r--meta/recipes-extended/timezone/timezone.inc7
-rw-r--r--meta/recipes-extended/wget/wget.inc2
-rw-r--r--meta/recipes-extended/wget/wget_1.21.2.bb (renamed from meta/recipes-extended/wget/wget_1.21.1.bb)2
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb6
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_41.0.bb (renamed from meta/recipes-gnome/epiphany/epiphany_40.3.bb)20
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch27
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch6
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch24
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb43
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb (renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb)7
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch4
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb)4
-rw-r--r--meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_41.0.bb (renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_40.0.bb)2
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_1.6.6.bb (renamed from meta/recipes-gnome/json-glib/json-glib_1.6.4.bb)2
-rw-r--r--meta/recipes-gnome/libdazzle/libdazzle_3.42.0.bb (renamed from meta/recipes-gnome/libdazzle/libdazzle_3.40.0.bb)2
-rw-r--r--meta/recipes-gnome/libhandy/libhandy_1.4.0.bb (renamed from meta/recipes-gnome/libhandy/libhandy_1.2.3.bb)4
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Auto-detect-Bsymbolic-fixes-configure-on-macOS.patch35
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch47
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Remove-non-reproducible-SRCDIR.patch30
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch148
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch53
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-vendor-system-deps-sort-dependencies-before-using-th.patch53
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/gtk-option.patch60
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.21.bb52
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.52.2.bb72
-rw-r--r--meta/recipes-graphics/glew/glew/notempdir.patch19
-rw-r--r--meta/recipes-graphics/glew/glew_2.2.0.bb1
-rw-r--r--meta/recipes-graphics/glslang/glslang_11.6.0.bb (renamed from meta/recipes-graphics/glslang/glslang_11.5.0.bb)2
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_3.0.0.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_2.9.0.bb)2
-rw-r--r--meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb2
-rw-r--r--meta/recipes-graphics/libva/libva-initial_2.13.0.bb (renamed from meta/recipes-graphics/libva/libva-initial_2.12.0.bb)0
-rw-r--r--meta/recipes-graphics/libva/libva-utils_2.13.0.bb (renamed from meta/recipes-graphics/libva/libva-utils_2.12.0.bb)4
-rw-r--r--meta/recipes-graphics/libva/libva.inc2
-rw-r--r--meta/recipes-graphics/libva/libva_2.13.0.bb (renamed from meta/recipes-graphics/libva/libva_2.12.0.bb)0
-rw-r--r--meta/recipes-graphics/mesa/files/without-neon.patch53
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_21.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc9
-rw-r--r--meta/recipes-graphics/mesa/mesa_21.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa_21.2.1.bb)0
-rw-r--r--meta/recipes-graphics/pango/pango_1.48.10.bb (renamed from meta/recipes-graphics/pango/pango_1.48.9.bb)2
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb5
-rw-r--r--meta/recipes-graphics/shaderc/shaderc_2021.2.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2021.1.bb)4
-rw-r--r--meta/recipes-graphics/spir/files/0001-fix-strncpy-bound-error.patch30
-rw-r--r--meta/recipes-graphics/spir/spirv-headers_1.5.4.bb2
-rw-r--r--meta/recipes-graphics/spir/spirv-tools_2021.3.bb (renamed from meta/recipes-graphics/spir/spirv-tools_2021.2.bb)6
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb (renamed from meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.4.bb)4
-rw-r--r--meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch32
-rw-r--r--meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch1664
-rw-r--r--meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch257
-rw-r--r--meta/recipes-graphics/vulkan/assimp_5.0.1.bb26
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-headers_1.2.191.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb)4
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-loader_1.2.191.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb)2
-rw-r--r--meta/recipes-graphics/vulkan/vulkan-tools_1.2.191.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb)4
-rw-r--r--meta/recipes-graphics/waffle/waffle_1.6.1.bb2
-rw-r--r--meta/recipes-graphics/wayland/libinput_1.19.1.bb (renamed from meta/recipes-graphics/wayland/libinput_1.18.1.bb)2
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols_1.23.bb (renamed from meta/recipes-graphics/wayland/wayland-protocols_1.21.bb)2
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb2
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start11
-rw-r--r--meta/recipes-graphics/wayland/weston/systemd-notify.weston-start9
-rw-r--r--meta/recipes-graphics/wayland/weston_9.0.0.bb5
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb6
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb)2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxi_1.8.bb (renamed from meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb)2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.0.bb)2
-rw-r--r--meta/recipes-graphics/xorg-lib/xkeyboard-config_2.34.bb (renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.33.bb)2
-rw-r--r--meta/recipes-graphics/xorg-proto/xorgproto_2021.5.bb (renamed from meta/recipes-graphics/xorg-proto/xorgproto_2021.4.99.2.bb)2
-rw-r--r--meta/recipes-graphics/xwayland/xwayland_21.1.2.bb2
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb1
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch24
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb6
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb (renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb)4
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.14.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb)6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb (renamed from meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb)10
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb (renamed from meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb)14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb24
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.14.bb (renamed from meta/recipes-kernel/linux/linux-yocto_5.13.bb)52
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-cpu-hotplug-Remove-deprecated-CPU-hotplug-functi.patch394
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0002-fix-Revert-Makefile-Enable-Wimplicit-fallthrough-for.patch829
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.0.bb9
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch221
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch41
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch55
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch46
-rwxr-xr-xmeta/recipes-kernel/lttng/lttng-tools/run-ptest1
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb)29
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch35
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch25
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch22
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb)11
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch26
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc3
-rw-r--r--meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb (renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.07.14.bb)2
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch67
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38171.patch42
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb6
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-devtools_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gst-examples_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.4.bb)5
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch50
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb)3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-rtpjitterbuffer-Fix-parsing-of-the-mediaclk-direct-f.patch33
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0003-Remove-volatile-from-static-vars-to-fix-build-with-g.patch100
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.4.bb)4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch14
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.4.bb)2
-rw-r--r--meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch13
-rw-r--r--meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb1
-rw-r--r--meta/recipes-multimedia/mpg123/mpg123_1.29.0.bb (renamed from meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb)2
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch6
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc4
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb1
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb2
-rw-r--r--meta/recipes-sato/webkit/libwpe_1.12.0.bb (renamed from meta/recipes-sato/webkit/libwpe_1.10.1.bb)4
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch26
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch10
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch133
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch31
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/include_xutil.patch8
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch14
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.34.0.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.32.3.bb)44
-rw-r--r--meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb2
-rw-r--r--meta/recipes-support/apr/apr/CVE-2021-35940.patch58
-rw-r--r--meta/recipes-support/apr/apr_1.7.0.bb1
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch33
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.42.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.40.3.bb)6
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch80
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch26
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch33
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20211016.bb (renamed from meta/recipes-support/ca-certificates/ca-certificates_20210119.bb)5
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb2
-rw-r--r--meta/recipes-support/curl/curl_7.79.1.bb (renamed from meta/recipes-support/curl/curl_7.78.0.bb)4
-rw-r--r--meta/recipes-support/diffoscope/diffoscope_187.bb (renamed from meta/recipes-support/diffoscope/diffoscope_181.bb)2
-rw-r--r--meta/recipes-support/fribidi/fribidi_1.0.11.bb (renamed from meta/recipes-support/fribidi/fribidi_1.0.10.bb)3
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch6
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch93
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.3.3.bb (renamed from meta/recipes-support/gnupg/gnupg_2.3.1.bb)3
-rw-r--r--meta/recipes-support/iso-codes/iso-codes_4.7.0.bb (renamed from meta/recipes-support/iso-codes/iso-codes_4.6.0.bb)2
-rw-r--r--meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch8
-rw-r--r--meta/recipes-support/itstool/itstool_2.0.7.bb (renamed from meta/recipes-support/itstool/itstool_2.0.6.bb)6
-rw-r--r--meta/recipes-support/libatomic-ops/libatomic-ops_7.6.12.bb (renamed from meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb)3
-rw-r--r--meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch34
-rw-r--r--meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch52
-rw-r--r--meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch10
-rw-r--r--meta/recipes-support/libcap/libcap_2.59.bb (renamed from meta/recipes-support/libcap/libcap_2.51.bb)7
-rw-r--r--meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch28
-rw-r--r--meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch81
-rw-r--r--meta/recipes-support/libevent/libevent/run-ptest10
-rw-r--r--meta/recipes-support/libevent/libevent_2.1.12.bb4
-rw-r--r--meta/recipes-support/libexif/files/CVE-2020-0198.patch66
-rw-r--r--meta/recipes-support/libexif/files/CVE-2020-0452.patch39
-rw-r--r--meta/recipes-support/libexif/libexif_0.6.23.bb (renamed from meta/recipes-support/libexif/libexif_0.6.22.bb)6
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.9.4.bb (renamed from meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb)2
-rw-r--r--meta/recipes-support/libgit2/libgit2_1.3.0.bb (renamed from meta/recipes-support/libgit2/libgit2_1.1.1.bb)8
-rw-r--r--meta/recipes-support/libical/libical_3.0.11.bb (renamed from meta/recipes-support/libical/libical_3.0.10.bb)4
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy/0001-Makefile-restore-build-reproducibility.patch27
-rw-r--r--meta/recipes-support/libjitterentropy/libjitterentropy_3.3.0.bb (renamed from meta/recipes-support/libjitterentropy/libjitterentropy_3.1.0.bb)7
-rw-r--r--meta/recipes-support/libmd/libmd_1.0.4.bb (renamed from meta/recipes-support/libmd/libmd_1.0.3.bb)2
-rw-r--r--meta/recipes-support/libseccomp/files/0001-arch-Add-riscv32-architecture-support.patch162
-rw-r--r--meta/recipes-support/libseccomp/files/0002-man-Add-RISCV64-to-arch-list.patch28
-rw-r--r--meta/recipes-support/libseccomp/files/0003-syscalls-update-the-syscall-defs-for-Linux-v5.15.0-r.patch (renamed from meta/recipes-support/libseccomp/files/0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch)60
-rw-r--r--meta/recipes-support/libseccomp/files/0004-syscalls-Add-quotactl_path.patch40
-rw-r--r--meta/recipes-support/libseccomp/libseccomp_2.5.2.bb (renamed from meta/recipes-support/libseccomp/libseccomp_2.5.1.bb)6
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.74.0.bb (renamed from meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb)6
-rw-r--r--meta/recipes-support/libsoup/libsoup_3.0.1.bb44
-rw-r--r--meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch6
-rw-r--r--meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch30
-rw-r--r--meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch112
-rw-r--r--meta/recipes-support/libssh2/files/CVE-2019-17498.patch131
-rw-r--r--meta/recipes-support/libssh2/files/run-ptest3
-rw-r--r--meta/recipes-support/libssh2/libssh2_1.10.0.bb (renamed from meta/recipes-support/libssh2/libssh2_1.9.0.bb)10
-rw-r--r--meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch27
-rw-r--r--meta/recipes-support/nghttp2/nghttp2_1.45.1.bb35
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch)126
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch)0
-rw-r--r--meta/recipes-support/pinentry/pinentry_1.2.0.bb (renamed from meta/recipes-support/pinentry/pinentry_1.1.1.bb)2
-rw-r--r--meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb (renamed from meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb)8
-rw-r--r--meta/recipes-support/rng-tools/rng-tools/rngd.service1
-rw-r--r--meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch28
-rw-r--r--meta/recipes-support/serf/serf_1.3.9.bb1
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_git.bb2
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.36.0.bb2
-rw-r--r--meta/recipes-support/vim/files/CVE-2021-3778.patch46
-rw-r--r--meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch207
-rw-r--r--meta/recipes-support/vim/vim.inc3
-rw-r--r--meta/site/arm-3214
-rw-r--r--meta/site/arm-6414
-rw-r--r--meta/site/arm-common3
-rw-r--r--meta/site/ix86-common17
-rw-r--r--meta/site/mips-common14
-rw-r--r--meta/site/mips-linux3
-rw-r--r--meta/site/mips64-linux3
-rw-r--r--meta/site/mips64el-linux3
-rw-r--r--meta/site/mipsel-linux3
-rw-r--r--meta/site/mipsisa32r6-linux3
-rw-r--r--meta/site/mipsisa32r6el-linux3
-rw-r--r--meta/site/mipsisa64r6-linux3
-rw-r--r--meta/site/mipsisa64r6el-linux3
-rw-r--r--meta/site/nios2-linux18
-rw-r--r--meta/site/powerpc32-linux17
-rw-r--r--meta/site/sh-common17
-rw-r--r--meta/site/x86_64-linux17
-rwxr-xr-xscripts/autobuilder-worker-prereq-tests5
-rwxr-xr-xscripts/gen-lockedsig-cache3
-rw-r--r--scripts/lib/build_perf/report.py3
-rw-r--r--scripts/lib/devtool/standard.py4
-rw-r--r--scripts/lib/recipetool/create.py193
-rw-r--r--scripts/lib/recipetool/create_npm.py60
-rw-r--r--scripts/lib/recipetool/licenses.csv37
-rw-r--r--scripts/lib/scriptutils.py3
-rw-r--r--scripts/lib/wic/partition.py2
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py74
-rwxr-xr-xscripts/oe-publish-sdk4
-rwxr-xr-xscripts/oepydevshell-internal.py2
-rw-r--r--scripts/pybootchartgui/pybootchartgui/draw.py5
-rwxr-xr-xscripts/runqemu4
-rwxr-xr-xscripts/sstate-cache-management.sh40
660 files changed, 8570 insertions, 11064 deletions
diff --git a/meta-selftest/recipes-test/logging-test/logging-test.bb b/meta-selftest/recipes-test/logging-test/logging-test.bb
new file mode 100644
index 0000000000..a6100123f9
--- /dev/null
+++ b/meta-selftest/recipes-test/logging-test/logging-test.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Destined to fail"
+LICENSE = "CLOSED"
+
+deltask do_patch
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_shelltest() {
+ echo "This is shell stdout"
+ echo "This is shell stderr" >&2
+ exit 1
+}
+addtask do_shelltest
+
+python do_pythontest_exit () {
+ print("This is python stdout")
+ sys.exit(1)
+}
+addtask do_pythontest_exit
+
+python do_pythontest_fatal () {
+ print("This is python fatal test stdout")
+ bb.fatal("This is a fatal error")
+}
+addtask do_pythontest_fatal
diff --git a/meta-selftest/wic/test_efi_plugin.wks b/meta-selftest/wic/test_efi_plugin.wks
new file mode 100644
index 0000000000..1603d6c4bb
--- /dev/null
+++ b/meta-selftest/wic/test_efi_plugin.wks
@@ -0,0 +1,6 @@
+# short-description: This file is used in oe-selftest wic module to test efi plugin
+
+part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,create-unified-kernel-image=true,initrd=${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" --active --align 1024 --use-uuid
+part / --source rootfs --fstype=ext4 --align 1024 --use-uuid
+
+bootloader --timeout=0 --append="console=ttyS0,115200n8"
diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
index f3c0d372eb..6b73a79524 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
+++ b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
@@ -19,15 +19,17 @@
#include <linux/module.h>
-int init_module(void)
+static int __init hello_init(void)
{
- printk("Hello World!\n");
+ pr_info("Hello World!\n");
return 0;
}
-void cleanup_module(void)
+static void __exit hello_exit(void)
{
- printk("Goodbye Cruel World!\n");
+ pr_info("Goodbye Cruel World!\n");
}
+module_init(hello_init);
+module_exit(hello_exit);
MODULE_LICENSE("GPL");
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index dd31dc0cd8..411d459ed0 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -51,6 +51,7 @@ ARCHIVER_MODE[diff-exclude] ?= ".pc autom4te.cache patches"
ARCHIVER_MODE[dumpdata] ?= "0"
ARCHIVER_MODE[recipe] ?= "0"
ARCHIVER_MODE[mirror] ?= "split"
+ARCHIVER_MODE[compression] ?= "gz"
DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
ARCHIVER_TOPDIR ?= "${WORKDIR}/archiver-sources"
@@ -409,15 +410,16 @@ def create_tarball(d, srcdir, suffix, ar_outdir):
# that we archive the actual directory and not just the link.
srcdir = os.path.realpath(srcdir)
+ compression_method = d.getVarFlag('ARCHIVER_MODE', 'compression')
bb.utils.mkdirhier(ar_outdir)
if suffix:
- filename = '%s-%s.tar.gz' % (d.getVar('PF'), suffix)
+ filename = '%s-%s.tar.%s' % (d.getVar('PF'), suffix, compression_method)
else:
- filename = '%s.tar.gz' % d.getVar('PF')
+ filename = '%s.tar.%s' % (d.getVar('PF'), compression_method)
tarname = os.path.join(ar_outdir, filename)
bb.note('Creating %s' % tarname)
- tar = tarfile.open(tarname, 'w:gz')
+ tar = tarfile.open(tarname, 'w:%s' % compression_method)
tar.add(srcdir, arcname=os.path.basename(srcdir), filter=exclude_useless_paths)
tar.close()
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 2c7968e659..4ab2460990 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -145,9 +145,12 @@ ACLOCALEXTRAPATH:class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/"
ACLOCALEXTRAPATH:class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/"
python autotools_aclocals () {
- d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True))
+ sitefiles, searched = siteinfo_get_files(d, sysrootcache=True)
+ d.setVar("CONFIG_SITE", " ".join(sitefiles))
}
+do_configure[file-checksums] += "${@' '.join(siteinfo_get_files(d, sysrootcache=False)[1])}"
+
CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am"
autotools_do_configure() {
diff --git a/meta/classes/baremetal-image.bbclass b/meta/classes/baremetal-image.bbclass
index 089c445522..81f5e5e93d 100644
--- a/meta/classes/baremetal-image.bbclass
+++ b/meta/classes/baremetal-image.bbclass
@@ -105,13 +105,17 @@ inherit qemuboot
python(){
# do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have
# /usr/bin on recipe-sysroot (qemu) populated
+ # The do_addto_recipe_sysroot dependency is coming from EXTRA_IMAGDEPENDS now,
+ # we just need to add the logic to add its dependency to do_image.
def extraimage_getdepends(task):
deps = ""
for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
# Make sure we only add it for qemu
if 'qemu' in dep:
- deps += " %s:%s" % (dep, task)
+ if ":" in dep:
+ deps += " %s " % (dep)
+ else:
+ deps += " %s:%s" % (dep, task)
return deps
- d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_addto_recipe_sysroot'))
- d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot'))
+ d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot'))
}
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 340ebe7d78..a65fcc6c1d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -12,7 +12,7 @@ inherit logging
OE_EXTRA_IMPORTS ?= ""
-OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license ${OE_EXTRA_IMPORTS}"
+OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license oe.qa oe.reproducible ${OE_EXTRA_IMPORTS}"
OE_IMPORTS[type] = "list"
PACKAGECONFIG_CONFARGS ??= ""
@@ -153,14 +153,14 @@ do_fetch[vardeps] += "SRCREV"
python base_do_fetch() {
src_uri = (d.getVar('SRC_URI') or "").split()
- if len(src_uri) == 0:
+ if not src_uri:
return
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.download()
except bb.fetch2.BBFetchException as e:
- bb.fatal(str(e))
+ bb.fatal("Bitbake Fetcher Error: " + repr(e))
}
addtask unpack after do_fetch
@@ -170,16 +170,54 @@ do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != o
python base_do_unpack() {
src_uri = (d.getVar('SRC_URI') or "").split()
- if len(src_uri) == 0:
+ if not src_uri:
return
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(d.getVar('WORKDIR'))
except bb.fetch2.BBFetchException as e:
- bb.fatal(str(e))
+ bb.fatal("Bitbake Fetcher Error: " + repr(e))
+}
+
+SSTATETASKS += "do_deploy_source_date_epoch"
+
+do_deploy_source_date_epoch () {
+ mkdir -p ${SDE_DEPLOYDIR}
+ if [ -e ${SDE_FILE} ]; then
+ echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}."
+ cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt
+ else
+ echo "${SDE_FILE} not found!"
+ fi
}
+python do_deploy_source_date_epoch_setscene () {
+ sstate_setscene(d)
+ bb.utils.mkdirhier(d.getVar('SDE_DIR'))
+ sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt')
+ if os.path.exists(sde_file):
+ target = d.getVar('SDE_FILE')
+ bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target))
+ bb.utils.rename(sde_file, target)
+ else:
+ bb.debug(1, "%s not found!" % sde_file)
+}
+
+do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}"
+do_deploy_source_date_epoch[sstate-plaindirs] = "${SDE_DEPLOYDIR}"
+addtask do_deploy_source_date_epoch_setscene
+addtask do_deploy_source_date_epoch before do_configure after do_patch
+
+python create_source_date_epoch_stamp() {
+ source_date_epoch = oe.reproducible.get_source_date_epoch(d, d.getVar('S'))
+ oe.reproducible.epochfile_write(source_date_epoch, d.getVar('SDE_FILE'), d)
+}
+do_unpack[postfuncs] += "create_source_date_epoch_stamp"
+
+def get_source_date_epoch_value(d):
+ return oe.reproducible.epochfile_read(d.getVar('SDE_FILE'), d)
+
def get_layers_branch_rev(d):
layers = (d.getVar("BBLAYERS") or "").split()
layers_branch_rev = ["%-20s = \"%s:%s\"" % (os.path.basename(i), \
@@ -693,7 +731,7 @@ python () {
if os.path.basename(p) == machine and os.path.isdir(p):
paths.append(p)
- if len(paths) != 0:
+ if paths:
for s in srcuri.split():
if not s.startswith("file://"):
continue
@@ -726,7 +764,7 @@ do_cleansstate[nostamp] = "1"
python do_cleanall() {
src_uri = (d.getVar('SRC_URI') or "").split()
- if len(src_uri) == 0:
+ if not src_uri:
return
try:
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index a613306270..62d0d781a1 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -287,7 +287,7 @@ python buildhistory_emit_pkghistory() {
r = bb.utils.vercmp((pkge, pkgv, pkgr), (last_pkge, last_pkgv, last_pkgr))
if r < 0:
msg = "Package version for package %s went backwards which would break package feeds (from %s:%s-%s to %s:%s-%s)" % (pkg, last_pkge, last_pkgv, last_pkgr, pkge, pkgv, pkgr)
- package_qa_handle_error("version-going-backwards", msg, d)
+ oe.qa.handle_error("version-going-backwards", msg, d)
pkginfo = PackageInfo(pkg)
# Apparently the version can be different on a per-package basis (see Python)
@@ -321,6 +321,7 @@ python buildhistory_emit_pkghistory() {
# Create files-in-<package-name>.txt files containing a list of files of each recipe's package
bb.build.exec_func("buildhistory_list_pkg_files", d)
+ oe.qa.exit_if_errors(d)
}
python buildhistory_emit_outputsigs() {
@@ -442,11 +443,16 @@ def buildhistory_list_installed(d, rootfs_type="image"):
else:
pkgs = sdk_list_installed_packages(d, rootfs_type == "sdk_target")
+ if rootfs_type == "sdk_host":
+ pkgdata_dir = d.getVar('PKGDATA_DIR_SDK')
+ else:
+ pkgdata_dir = d.getVar('PKGDATA_DIR')
+
for output_type, output_file in process_list:
output_file_full = os.path.join(d.getVar('WORKDIR'), output_file)
with open(output_file_full, 'w') as output:
- output.write(format_pkg_list(pkgs, output_type, d.getVar('PKGDATA_DIR')))
+ output.write(format_pkg_list(pkgs, output_type, pkgdata_dir))
python buildhistory_list_installed_image() {
buildhistory_list_installed(d)
@@ -496,13 +502,19 @@ buildhistory_get_installed() {
echo "}" >> $1/depends.dot
rm $1/depends.tmp
+ # Set correct pkgdatadir
+ pkgdatadir=${PKGDATA_DIR}
+ if [ "$2" == "sdk" ] && [ "$3" == "host" ]; then
+ pkgdatadir="${PKGDATA_DIR_SDK}"
+ fi
+
# Produce installed package sizes list
- oe-pkgdata-util -p ${PKGDATA_DIR} read-value "PKGSIZE" -n -f $pkgcache > $1/installed-package-sizes.tmp
+ oe-pkgdata-util -p $pkgdatadir read-value "PKGSIZE" -n -f $pkgcache > $1/installed-package-sizes.tmp
cat $1/installed-package-sizes.tmp | awk '{print $2 "\tKiB\t" $1}' | sort -n -r > $1/installed-package-sizes.txt
rm $1/installed-package-sizes.tmp
# Produce package info: runtime_name, buildtime_name, recipe, version, size
- oe-pkgdata-util -p ${PKGDATA_DIR} read-value "PACKAGE,PN,PV,PKGSIZE" -n -f $pkgcache > $1/installed-package-info.tmp
+ oe-pkgdata-util -p $pkgdatadir read-value "PACKAGE,PN,PV,PKGSIZE" -n -f $pkgcache > $1/installed-package-info.tmp
cat $1/installed-package-info.tmp | sort -n -r -k 5 > $1/installed-package-info.txt
rm $1/installed-package-info.tmp
@@ -542,7 +554,7 @@ buildhistory_get_sdk_installed() {
return
fi
- buildhistory_get_installed ${BUILDHISTORY_DIR_SDK}/$1 sdk
+ buildhistory_get_installed ${BUILDHISTORY_DIR_SDK}/$1 sdk $1
}
buildhistory_get_sdk_installed_host() {
@@ -773,7 +785,7 @@ def buildhistory_get_imagevars(d):
def buildhistory_get_sdkvars(d):
if d.getVar('BB_WORKERCONTEXT') != '1':
return ""
- sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE"
+ sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES TOOLCHAIN_HOST_TASK TOOLCHAIN_TARGET_TASK BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE"
if d.getVar('BB_CURRENTTASK') == 'populate_sdk_ext':
# Extensible SDK uses some additional variables
sdkvars += " SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST SDK_UPDATE_URL SDK_EXT_TYPE SDK_RECRDEP_TASKS SDK_INCLUDE_PKGDATA SDK_INCLUDE_TOOLCHAIN"
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 9758065bfc..93d11e1bee 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -20,7 +20,7 @@ PERLLIBDIRS:class-native = "${libdir}/perl5"
def cpan_upstream_check_pattern(d):
for x in (d.getVar('SRC_URI') or '').split(' '):
if x.startswith("https://cpan.metacpan.org"):
- _pattern = x.split('/')[-1].replace(d.getVar('PV'), '(?P<pver>\d+.\d+)')
+ _pattern = x.split('/')[-1].replace(d.getVar('PV'), r'(?P<pver>\d+.\d+)')
return _pattern
return ''
diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass
index 1e0b360558..739b46e9b3 100644
--- a/meta/classes/create-spdx.bbclass
+++ b/meta/classes/create-spdx.bbclass
@@ -13,6 +13,9 @@ SPDXDIR ??= "${WORKDIR}/spdx"
SPDXDEPLOY = "${SPDXDIR}/deploy"
SPDXWORK = "${SPDXDIR}/work"
+SPDX_TOOL_NAME ??= "oe-spdx-creator"
+SPDX_TOOL_VERSION ??= "1.0"
+
SPDXRUNTIMEDEPLOY = "${SPDXDIR}/runtime-deploy"
SPDX_INCLUDE_SOURCES ??= "0"
@@ -32,6 +35,10 @@ def get_doc_namespace(d, doc):
namespace_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, d.getVar("SPDX_UUID_NAMESPACE"))
return "%s/%s-%s" % (d.getVar("SPDX_NAMESPACE_PREFIX"), doc.name, str(uuid.uuid5(namespace_uuid, doc.name)))
+def recipe_spdx_is_native(d, recipe):
+ return any(a.annotationType == "OTHER" and
+ a.annotator == "Tool: %s - %s" % (d.getVar("SPDX_TOOL_NAME"), d.getVar("SPDX_TOOL_VERSION")) and
+ a.comment == "isNative" for a in recipe.annotations)
def is_work_shared(d):
pn = d.getVar('PN')
@@ -67,6 +74,7 @@ def convert_license_to_spdx(lic, document, d, existing={}):
extracted_info = oe.spdx.SPDXExtractedLicensingInfo()
extracted_info.name = name
extracted_info.licenseId = ident
+ extracted_info.extractedText = None
if name == "PD":
# Special-case this.
@@ -78,10 +86,12 @@ def convert_license_to_spdx(lic, document, d, existing={}):
with (Path(directory) / name).open(errors="replace") as f:
extracted_info.extractedText = f.read()
break
- except Exception as e:
- # Error out, as the license was in available_licenses so
- # should be on disk somewhere.
- bb.error(f"Cannot find text for license {name}: {e}")
+ except FileNotFoundError:
+ pass
+ if extracted_info.extractedText is None:
+ # Error out, as the license was in available_licenses so should
+ # be on disk somewhere.
+ bb.error("Cannot find text for license %s" % name)
else:
# If it's not SPDX, or PD, or in available licenses, then NO_GENERIC_LICENSE must be set
filename = d.getVarFlag('NO_GENERIC_LICENSE', name)
@@ -90,7 +100,7 @@ def convert_license_to_spdx(lic, document, d, existing={}):
with open(filename, errors="replace") as f:
extracted_info.extractedText = f.read()
else:
- bb.error(f"Cannot find any text for license {name}")
+ bb.error("Cannot find any text for license %s" % name)
extracted[name] = extracted_info
document.hasExtractedLicensingInfos.append(extracted_info)
@@ -105,6 +115,9 @@ def convert_license_to_spdx(lic, document, d, existing={}):
if l == "|":
return "OR"
+ if l == "CLOSED":
+ return "NONE"
+
spdx_license = d.getVarFlag("SPDXLICENSEMAP", l) or l
if spdx_license in license_data["licenses"]:
return spdx_license
@@ -270,7 +283,7 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag
doc_ref.checksum.checksumValue = source_file.doc_sha1
package_doc.externalDocumentRefs.append(doc_ref)
- ref_id = "%s:%s" % (doc_ref.externalDocumentId, source_file.file.SPDXID),
+ ref_id = "%s:%s" % (doc_ref.externalDocumentId, source_file.file.SPDXID)
else:
bb.debug(1, "Debug source %s with SHA256 %s not found in any dependency" % (str(debugsrc_path), file_sha256))
break
@@ -330,6 +343,10 @@ def collect_dep_sources(d, dep_recipes):
sources = {}
for dep in dep_recipes:
+ # Don't collect sources from native recipes as they
+ # match non-native sources also.
+ if recipe_spdx_is_native(d, dep.recipe):
+ continue
recipe_files = set(dep.recipe.hasFiles)
for spdx_file in dep.doc.files:
@@ -376,7 +393,6 @@ python do_create_spdx() {
include_sources = d.getVar("SPDX_INCLUDE_SOURCES") == "1"
archive_sources = d.getVar("SPDX_ARCHIVE_SOURCES") == "1"
archive_packaged = d.getVar("SPDX_ARCHIVE_PACKAGED") == "1"
- is_native = bb.data.inherits_class("native", d)
creation_time = datetime.now(tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -395,6 +411,13 @@ python do_create_spdx() {
recipe.name = d.getVar("PN")
recipe.versionInfo = d.getVar("PV")
recipe.SPDXID = oe.sbom.get_recipe_spdxid(d)
+ if bb.data.inherits_class("native", d):
+ annotation = oe.spdx.SPDXAnnotation()
+ annotation.annotationDate = creation_time
+ annotation.annotationType = "OTHER"
+ annotation.annotator = "Tool: %s - %s" % (d.getVar("SPDX_TOOL_NAME"), d.getVar("SPDX_TOOL_VERSION"))
+ annotation.comment = "isNative"
+ recipe.annotations.append(annotation)
for s in d.getVar('SRC_URI').split():
if not s.startswith("file://"):
@@ -474,7 +497,7 @@ python do_create_spdx() {
sources = collect_dep_sources(d, dep_recipes)
found_licenses = {license.name:recipe_ref.externalDocumentId + ":" + license.licenseId for license in doc.hasExtractedLicensingInfos}
- if not is_native:
+ if not recipe_spdx_is_native(d, recipe):
bb.build.exec_func("read_subpackage_metadata", d)
pkgdest = Path(d.getVar("PKGDEST"))
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 447a2bb158..ac82e86356 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -40,6 +40,8 @@ python () {
extralibcs = [""]
if "musl" in d.getVar("BASECANADIANEXTRAOS"):
extralibcs.append("musl")
+ if "android" in tos:
+ extralibcs.append("android")
for variant in ["", "spe", "x32", "eabi", "n32", "_ilp32"]:
for libc in extralibcs:
entry = "linux"
@@ -167,7 +169,7 @@ USE_NLS = "${SDKUSE_NLS}"
# and not any particular tune that is enabled.
TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
-PKGDATA_DIR = "${TMPDIR}/pkgdata/${SDK_SYS}"
+PKGDATA_DIR = "${PKGDATA_DIR_SDK}"
# If MLPREFIX is set by multilib code, shlibs
# points to the wrong place so force it
SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs2"
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 00e0de84f3..3e6a2f60b9 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -72,10 +72,6 @@ libexecdir = "${exec_prefix}/libexec/${CROSS_TARGET_SYS_DIR}"
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/"
do_packagedata[stamp-extra-info] = ""
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
-
USE_NLS = "no"
export CC = "${BUILD_CC}"
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 76dd0b42ee..62dc958d9a 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -34,7 +34,7 @@ python () {
d.delVarFlag("do_devshell", "fakeroot")
}
-def devpyshell(d):
+def pydevshell(d):
import code
import select
@@ -140,17 +140,17 @@ def devpyshell(d):
os.kill(child, signal.SIGTERM)
break
-python do_devpyshell() {
+python do_pydevshell() {
import signal
try:
- devpyshell(d)
+ pydevshell(d)
except SystemExit:
# Stop the SIGTERM above causing an error exit code
return
finally:
return
}
-addtask devpyshell after do_patch
+addtask pydevshell after do_patch
-do_devpyshell[nostamp] = "1"
+do_pydevshell[nostamp] = "1"
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 54b08adf62..abfe24bace 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -109,6 +109,15 @@ python () {
if local_srcuri and task in fetch_tasks:
continue
bb.build.deltask(task, d)
+ if task == 'do_unpack':
+ # The reproducible build create_source_date_epoch_stamp function must
+ # be run after the source is available and before the
+ # do_deploy_source_date_epoch task. In the normal case, it's attached
+ # to do_unpack as a postfuncs, but since we removed do_unpack (above)
+ # we need to move the function elsewhere. The easiest thing to do is
+ # move it into the prefuncs of the do_deploy_source_date_epoch task.
+ # This is safe, as externalsrc runs with the source already unpacked.
+ d.prependVarFlag('do_deploy_source_date_epoch', 'prefuncs', 'create_source_date_epoch_stamp ')
d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ")
d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ")
diff --git a/meta/classes/image-artifact-names.bbclass b/meta/classes/image-artifact-names.bbclass
index 3ac8dd731a..f5769e520f 100644
--- a/meta/classes/image-artifact-names.bbclass
+++ b/meta/classes/image-artifact-names.bbclass
@@ -4,7 +4,7 @@
IMAGE_BASENAME ?= "${PN}"
IMAGE_VERSION_SUFFIX ?= "-${DATETIME}"
-IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
+IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH"
IMAGE_NAME ?= "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}-${MACHINE}"
@@ -13,3 +13,10 @@ IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}-${MACHINE}"
# by default) followed by additional suffices which describe the format (.ext4,
# .ext4.xz, etc.).
IMAGE_NAME_SUFFIX ??= ".rootfs"
+
+python () {
+ if bb.data.inherits_class('deploy', d) and d.getVar("IMAGE_VERSION_SUFFIX") == "-${DATETIME}":
+ import datetime
+ d.setVar("IMAGE_VERSION_SUFFIX", "-" + datetime.datetime.fromtimestamp(int(d.getVar("SOURCE_DATE_EPOCH")), datetime.timezone.utc).strftime('%Y%m%d%H%M%S'))
+ d.setVarFlag("IMAGE_VERSION_SUFFIX", "vardepvalue", "")
+}
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index 0da094a551..8158eeaf4c 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -46,17 +46,12 @@ prelink_image () {
dynamic_loader=${@get_linuxloader(d)}
# prelink!
- if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
- bbnote " prelink: BUILD_REPRODUCIBLE_BINARIES..."
- if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
- export PRELINK_TIMESTAMP=`git log -1 --pretty=%ct `
- else
- export PRELINK_TIMESTAMP=$REPRODUCIBLE_TIMESTAMP_ROOTFS
- fi
- ${STAGING_SBINDIR_NATIVE}/prelink --root ${IMAGE_ROOTFS} -am -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader
+ if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
+ export PRELINK_TIMESTAMP=`git log -1 --pretty=%ct `
else
- ${STAGING_SBINDIR_NATIVE}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader
+ export PRELINK_TIMESTAMP=$REPRODUCIBLE_TIMESTAMP_ROOTFS
fi
+ ${STAGING_SBINDIR_NATIVE}/prelink --root ${IMAGE_ROOTFS} -am -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader
# Remove the prelink.conf if we had to add it.
if [ "$dummy_prelink_conf" = "true" ]; then
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d76895178f..2fa69a40d1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -138,7 +138,10 @@ python () {
def extraimage_getdepends(task):
deps = ""
for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
- deps += " %s:%s" % (dep, task)
+ if ":" in dep:
+ deps += " %s " % (dep)
+ else:
+ deps += " %s:%s" % (dep, task)
return deps
d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot'))
@@ -431,6 +434,7 @@ python () {
localdata.delVar('DATETIME')
localdata.delVar('DATE')
localdata.delVar('TMPDIR')
+ localdata.delVar('IMAGE_VERSION_SUFFIX')
vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split()
for dep in vardepsexclude:
localdata.delVar(dep)
@@ -647,17 +651,15 @@ ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge'
POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}"
reproducible_final_image_task () {
- if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
+ if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
+ REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true
if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
- REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true
- if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
- REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}`
- fi
+ REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}`
fi
- # Set mtime of all files to a reproducible value
- bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS"
- find ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS
fi
+ # Set mtime of all files to a reproducible value
+ bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS"
+ find ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS
}
systemd_preset_all () {
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 2f1a0b709c..e3863c88a9 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -1,11 +1,36 @@
# The WICVARS variable is used to define list of bitbake variables used in wic code
# variables from this list is written to <image>.env file
WICVARS ?= "\
- BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_EFI_BOOT_FILES IMAGE_BOOT_FILES \
- IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
- ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS HOSTTOOLS_DIR \
- KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND \
- ASSUME_PROVIDED PSEUDO_IGNORE_PATHS"
+ APPEND \
+ ASSUME_PROVIDED \
+ BBLAYERS \
+ DEPLOY_DIR_IMAGE \
+ FAKEROOTCMD \
+ HOSTTOOLS_DIR \
+ IMAGE_BASENAME \
+ IMAGE_BOOT_FILES \
+ IMAGE_EFI_BOOT_FILES \
+ IMAGE_LINK_NAME \
+ IMAGE_ROOTFS \
+ IMGDEPLOYDIR \
+ INITRAMFS_FSTYPES \
+ INITRAMFS_IMAGE \
+ INITRAMFS_IMAGE_BUNDLE \
+ INITRAMFS_LINK_NAME \
+ INITRD \
+ INITRD_LIVE \
+ ISODIR \
+ KERNEL_IMAGETYPE \
+ MACHINE \
+ PSEUDO_IGNORE_PATHS \
+ RECIPE_SYSROOT_NATIVE \
+ ROOTFS_SIZE \
+ STAGING_DATADIR \
+ STAGING_DIR \
+ STAGING_DIR_HOST \
+ STAGING_LIBDIR \
+ TARGET_SYS \
+"
inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)}
@@ -60,8 +85,8 @@ do_image_wic[deptask] += "do_image_complete"
WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native"
WKS_FILE_DEPENDS_BOOTLOADERS = ""
-WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot"
-WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot"
+WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release"
+WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release"
WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi"
WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 20d4e4d746..1e2f1b768a 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -18,8 +18,6 @@
# files under exec_prefix
# -Check if the package name is upper case
-QA_SANE = "True"
-
# Elect whether a given type of error is a warning or error, they may
# have been set by other files.
WARN_QA ?= " libdir xorg-driver-abi \
@@ -28,6 +26,8 @@ WARN_QA ?= " libdir xorg-driver-abi \
invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \
mime mime-xdg unlisted-pkg-lics unhandled-features-check \
missing-update-alternatives native-last missing-ptest \
+ license-exists license-no-generic license-syntax license-format \
+ license-incompatible license-file-missing \
"
ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
@@ -59,32 +59,6 @@ def package_qa_clean_path(path, d, pkg=None):
path = path.replace(os.path.join(d.getVar("PKGDEST"), pkg), "/")
return path.replace(d.getVar("TMPDIR"), "/").replace("//", "/")
-def package_qa_write_error(type, error, d):
- logfile = d.getVar('QA_LOGFILE')
- if logfile:
- p = d.getVar('P')
- with open(logfile, "a+") as f:
- f.write("%s: %s [%s]\n" % (p, error, type))
-
-def package_qa_handle_error(error_class, error_msg, d):
- if error_class in (d.getVar("ERROR_QA") or "").split():
- package_qa_write_error(error_class, error_msg, d)
- bb.error("QA Issue: %s [%s]" % (error_msg, error_class))
- d.setVar("QA_SANE", False)
- return False
- elif error_class in (d.getVar("WARN_QA") or "").split():
- package_qa_write_error(error_class, error_msg, d)
- bb.warn("QA Issue: %s [%s]" % (error_msg, error_class))
- else:
- bb.note("QA Issue: %s [%s]" % (error_msg, error_class))
- return True
-
-def package_qa_add_message(messages, section, new_msg):
- if section not in messages:
- messages[section] = new_msg
- else:
- messages[section] = messages[section] + "\n" + new_msg
-
QAPATHTEST[shebang-size] = "package_qa_check_shebang_size"
def package_qa_check_shebang_size(path, name, d, elf, messages):
import stat
@@ -106,7 +80,7 @@ def package_qa_check_shebang_size(path, name, d, elf, messages):
return
if len(stanza) > 129:
- package_qa_add_message(messages, "shebang-size", "%s: %s maximum shebang size exceeded, the maximum size is 128." % (name, package_qa_clean_path(path, d)))
+ oe.qa.add_message(messages, "shebang-size", "%s: %s maximum shebang size exceeded, the maximum size is 128." % (name, package_qa_clean_path(path, d)))
return
QAPATHTEST[libexec] = "package_qa_check_libexec"
@@ -118,7 +92,7 @@ def package_qa_check_libexec(path,name, d, elf, messages):
return True
if 'libexec' in path.split(os.path.sep):
- package_qa_add_message(messages, "libexec", "%s: %s is using libexec please relocate to %s" % (name, package_qa_clean_path(path, d), libexec))
+ oe.qa.add_message(messages, "libexec", "%s: %s is using libexec please relocate to %s" % (name, package_qa_clean_path(path, d), libexec))
return False
return True
@@ -146,7 +120,7 @@ def package_qa_check_rpath(file,name, d, elf, messages):
rpath = m.group(1)
for dir in bad_dirs:
if dir in rpath:
- package_qa_add_message(messages, "rpaths", "package %s contains bad RPATH %s in file %s" % (name, rpath, file))
+ oe.qa.add_message(messages, "rpaths", "package %s contains bad RPATH %s in file %s" % (name, rpath, file))
QAPATHTEST[useless-rpaths] = "package_qa_check_useless_rpaths"
def package_qa_check_useless_rpaths(file, name, d, elf, messages):
@@ -176,7 +150,7 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
# The dynamic linker searches both these places anyway. There is no point in
# looking there again.
- package_qa_add_message(messages, "useless-rpaths", "%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d, name), rpath))
+ oe.qa.add_message(messages, "useless-rpaths", "%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d, name), rpath))
QAPATHTEST[dev-so] = "package_qa_check_dev"
def package_qa_check_dev(path, name, d, elf, messages):
@@ -185,7 +159,7 @@ def package_qa_check_dev(path, name, d, elf, messages):
"""
if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-ptest") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path):
- package_qa_add_message(messages, "dev-so", "non -dev/-dbg/nativesdk- package %s contains symlink .so '%s'" % \
+ oe.qa.add_message(messages, "dev-so", "non -dev/-dbg/nativesdk- package %s contains symlink .so '%s'" % \
(name, package_qa_clean_path(path, d, name)))
QAPATHTEST[dev-elf] = "package_qa_check_dev_elf"
@@ -196,7 +170,7 @@ def package_qa_check_dev_elf(path, name, d, elf, messages):
install link-time .so files that are linker scripts.
"""
if name.endswith("-dev") and path.endswith(".so") and not os.path.islink(path) and elf:
- package_qa_add_message(messages, "dev-elf", "-dev package %s contains non-symlink .so '%s'" % \
+ oe.qa.add_message(messages, "dev-elf", "-dev package %s contains non-symlink .so '%s'" % \
(name, package_qa_clean_path(path, d, name)))
QAPATHTEST[staticdev] = "package_qa_check_staticdev"
@@ -209,7 +183,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages):
"""
if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path:
- package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \
+ oe.qa.add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \
(name, package_qa_clean_path(path,d, name)))
QAPATHTEST[mime] = "package_qa_check_mime"
@@ -220,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages):
"""
if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d):
- package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \
+ oe.qa.add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \
(name, package_qa_clean_path(path,d)))
QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg"
@@ -247,9 +221,9 @@ def package_qa_check_mime_xdg(path, name, d, elf, messages):
if name == d.getVar('PN'):
pkgname = '${PN}'
wstr += "If yes: add \'inhert mime-xdg\' and \'MIME_XDG_PACKAGES += \"%s\"\' / if no add \'INSANE_SKIP:%s += \"mime-xdg\"\' to recipe." % (pkgname, pkgname)
- package_qa_add_message(messages, "mime-xdg", wstr)
+ oe.qa.add_message(messages, "mime-xdg", wstr)
if mime_type_found:
- package_qa_add_message(messages, "mime-xdg", "package contains desktop file with key 'MimeType' but does not inhert mime-xdg: %s path '%s'" % \
+ oe.qa.add_message(messages, "mime-xdg", "package contains desktop file with key 'MimeType' but does not inhert mime-xdg: %s path '%s'" % \
(name, package_qa_clean_path(path,d)))
def package_qa_check_libdir(d):
@@ -313,7 +287,7 @@ def package_qa_check_libdir(d):
pass
if messages:
- package_qa_handle_error("libdir", "\n".join(messages), d)
+ oe.qa.handle_error("libdir", "\n".join(messages), d)
QAPATHTEST[debug-files] = "package_qa_check_dbg"
def package_qa_check_dbg(path, name, d, elf, messages):
@@ -323,7 +297,7 @@ def package_qa_check_dbg(path, name, d, elf, messages):
if not "-dbg" in name and not "-ptest" in name:
if '.debug' in path.split(os.path.sep):
- package_qa_add_message(messages, "debug-files", "non debug package contains .debug directory: %s path %s" % \
+ oe.qa.add_message(messages, "debug-files", "non debug package contains .debug directory: %s path %s" % \
(name, package_qa_clean_path(path,d)))
QAPATHTEST[arch] = "package_qa_check_arch"
@@ -343,7 +317,7 @@ def package_qa_check_arch(path,name,d, elf, messages):
if target_arch == "allarch":
pn = d.getVar('PN')
- package_qa_add_message(messages, "arch", pn + ": Recipe inherits the allarch class, but has packaged architecture-specific binaries")
+ oe.qa.add_message(messages, "arch", pn + ": Recipe inherits the allarch class, but has packaged architecture-specific binaries")
return
# FIXME: Cross package confuse this check, so just skip them
@@ -366,13 +340,13 @@ def package_qa_check_arch(path,name,d, elf, messages):
target_os == "linux-gnu_ilp32" or re.match(r'mips64.*32', d.getVar('DEFAULTTUNE')))
is_bpf = (oe.qa.elf_machine_to_string(elf.machine()) == "BPF")
if not ((machine == elf.machine()) or is_32 or is_bpf):
- package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) in %s" % \
+ oe.qa.add_message(messages, "arch", "Architecture did not match (%s, expected %s) in %s" % \
(oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path, d, name)))
elif not ((bits == elf.abiSize()) or is_32 or is_bpf):
- package_qa_add_message(messages, "arch", "Bit size did not match (%d, expected %d) in %s" % \
+ oe.qa.add_message(messages, "arch", "Bit size did not match (%d, expected %d) in %s" % \
(elf.abiSize(), bits, package_qa_clean_path(path, d, name)))
elif not ((littleendian == elf.isLittleEndian()) or is_bpf):
- package_qa_add_message(messages, "arch", "Endiannes did not match (%d, expected %d) in %s" % \
+ oe.qa.add_message(messages, "arch", "Endiannes did not match (%d, expected %d) in %s" % \
(elf.isLittleEndian(), littleendian, package_qa_clean_path(path,d, name)))
QAPATHTEST[desktop] = "package_qa_check_desktop"
@@ -385,7 +359,7 @@ def package_qa_check_desktop(path, name, d, elf, messages):
output = os.popen("%s %s" % (desktop_file_validate, path))
# This only produces output on errors
for l in output:
- package_qa_add_message(messages, "desktop", "Desktop file issue: " + l.strip())
+ oe.qa.add_message(messages, "desktop", "Desktop file issue: " + l.strip())
QAPATHTEST[textrel] = "package_qa_textrel"
def package_qa_textrel(path, name, d, elf, messages):
@@ -411,7 +385,7 @@ def package_qa_textrel(path, name, d, elf, messages):
if not sane:
path = package_qa_clean_path(path, d, name)
- package_qa_add_message(messages, "textrel", "%s: ELF binary %s has relocations in .text" % (name, path))
+ oe.qa.add_message(messages, "textrel", "%s: ELF binary %s has relocations in .text" % (name, path))
QAPATHTEST[ldflags] = "package_qa_hash_style"
def package_qa_hash_style(path, name, d, elf, messages):
@@ -446,7 +420,7 @@ def package_qa_hash_style(path, name, d, elf, messages):
sane = True
if has_syms and not sane:
path = package_qa_clean_path(path, d, name)
- package_qa_add_message(messages, "ldflags", "File %s in package %s doesn't have GNU_HASH (didn't pass LDFLAGS?)" % (path, name))
+ oe.qa.add_message(messages, "ldflags", "File %s in package %s doesn't have GNU_HASH (didn't pass LDFLAGS?)" % (path, name))
QAPATHTEST[buildpaths] = "package_qa_check_buildpaths"
@@ -467,7 +441,7 @@ def package_qa_check_buildpaths(path, name, d, elf, messages):
file_content = f.read()
if tmpdir in file_content:
trimmed = path.replace(os.path.join (d.getVar("PKGDEST"), name), "")
- package_qa_add_message(messages, "buildpaths", "File %s in package %s contains reference to TMPDIR" % (trimmed, name))
+ oe.qa.add_message(messages, "buildpaths", "File %s in package %s contains reference to TMPDIR" % (trimmed, name))
QAPATHTEST[xorg-driver-abi] = "package_qa_check_xorg_driver_abi"
@@ -486,7 +460,7 @@ def package_qa_check_xorg_driver_abi(path, name, d, elf, messages):
for rdep in bb.utils.explode_deps(d.getVar('RDEPENDS:' + name) or ""):
if rdep.startswith("%sxorg-abi-" % mlprefix):
return
- package_qa_add_message(messages, "xorg-driver-abi", "Package %s contains Xorg driver (%s) but no xorg-abi- dependencies" % (name, os.path.basename(path)))
+ oe.qa.add_message(messages, "xorg-driver-abi", "Package %s contains Xorg driver (%s) but no xorg-abi- dependencies" % (name, os.path.basename(path)))
QAPATHTEST[infodir] = "package_qa_check_infodir"
def package_qa_check_infodir(path, name, d, elf, messages):
@@ -496,7 +470,7 @@ def package_qa_check_infodir(path, name, d, elf, messages):
infodir = d.expand("${infodir}/dir")
if infodir in path:
- package_qa_add_message(messages, "infodir", "The /usr/share/info/dir file is not meant to be shipped in a particular package.")
+ oe.qa.add_message(messages, "infodir", "The /usr/share/info/dir file is not meant to be shipped in a particular package.")
QAPATHTEST[symlink-to-sysroot] = "package_qa_check_symlink_to_sysroot"
def package_qa_check_symlink_to_sysroot(path, name, d, elf, messages):
@@ -509,7 +483,7 @@ def package_qa_check_symlink_to_sysroot(path, name, d, elf, messages):
tmpdir = d.getVar('TMPDIR')
if target.startswith(tmpdir):
trimmed = path.replace(os.path.join (d.getVar("PKGDEST"), name), "")
- package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name))
+ oe.qa.add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name))
# Check license variables
do_populate_lic[postfuncs] += "populate_lic_qa_checksum"
@@ -517,7 +491,6 @@ python populate_lic_qa_checksum() {
"""
Check for changes in the license files.
"""
- sane = True
lic_files = d.getVar('LIC_FILES_CHKSUM') or ''
lic = d.getVar('LICENSE')
@@ -527,7 +500,7 @@ python populate_lic_qa_checksum() {
return
if not lic_files and d.getVar('SRC_URI'):
- sane &= package_qa_handle_error("license-checksum", pn + ": Recipe file fetches files and does not have license file information (LIC_FILES_CHKSUM)", d)
+ oe.qa.handle_error("license-checksum", pn + ": Recipe file fetches files and does not have license file information (LIC_FILES_CHKSUM)", d)
srcdir = d.getVar('S')
corebase_licensefile = d.getVar('COREBASE') + "/LICENSE"
@@ -535,11 +508,11 @@ python populate_lic_qa_checksum() {
try:
(type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
except bb.fetch.MalformedUrl:
- sane &= package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM contains an invalid URL: " + url, d)
+ oe.qa.handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM contains an invalid URL: " + url, d)
continue
srclicfile = os.path.join(srcdir, path)
if not os.path.isfile(srclicfile):
- sane &= package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile, d)
+ oe.qa.handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile, d)
continue
if (srclicfile == corebase_licensefile):
@@ -607,10 +580,9 @@ python populate_lic_qa_checksum() {
else:
msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url
msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum
- sane &= package_qa_handle_error("license-checksum", msg, d)
+ oe.qa.handle_error("license-checksum", msg, d)
- if not sane:
- bb.fatal("Fatal QA errors found, failing task.")
+ oe.qa.exit_if_errors(d)
}
def qa_check_staged(path,d):
@@ -622,7 +594,6 @@ def qa_check_staged(path,d):
responsible for the errors easily even if we look at every .pc and .la file.
"""
- sane = True
tmpdir = d.getVar('TMPDIR')
workdir = os.path.join(tmpdir, "work")
recipesysroot = d.getVar("RECIPE_SYSROOT")
@@ -655,16 +626,14 @@ def qa_check_staged(path,d):
file_content = file_content.replace(recipesysroot, "")
if workdir in file_content:
error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
- sane &= package_qa_handle_error("la", error_msg, d)
+ oe.qa.handle_error("la", error_msg, d)
elif file.endswith(".pc") and not skip_pkgconfig:
with open(path) as f:
file_content = f.read()
file_content = file_content.replace(recipesysroot, "")
if pkgconfigcheck in file_content:
error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root)
- sane &= package_qa_handle_error("pkgconfig", error_msg, d)
-
- return sane
+ oe.qa.handle_error("pkgconfig", error_msg, d)
# Run all package-wide warnfuncs and errorfuncs
def package_qa_package(warnfuncs, errorfuncs, package, d):
@@ -677,9 +646,9 @@ def package_qa_package(warnfuncs, errorfuncs, package, d):
func(package, d, errors)
for w in warnings:
- package_qa_handle_error(w, warnings[w], d)
+ oe.qa.handle_error(w, warnings[w], d)
for e in errors:
- package_qa_handle_error(e, errors[e], d)
+ oe.qa.handle_error(e, errors[e], d)
return len(errors) == 0
@@ -694,16 +663,14 @@ def package_qa_recipe(warnfuncs, errorfuncs, pn, d):
func(pn, d, errors)
for w in warnings:
- package_qa_handle_error(w, warnings[w], d)
+ oe.qa.handle_error(w, warnings[w], d)
for e in errors:
- package_qa_handle_error(e, errors[e], d)
+ oe.qa.handle_error(e, errors[e], d)
return len(errors) == 0
# Walk over all files in a directory and call func
def package_qa_walk(warnfuncs, errorfuncs, package, d):
- import oe.qa
-
#if this will throw an exception, then fix the dict above
target_os = d.getVar('TARGET_OS')
target_arch = d.getVar('TARGET_ARCH')
@@ -724,9 +691,9 @@ def package_qa_walk(warnfuncs, errorfuncs, package, d):
func(path, package, d, elf, errors)
for w in warnings:
- package_qa_handle_error(w, warnings[w], d)
+ oe.qa.handle_error(w, warnings[w], d)
for e in errors:
- package_qa_handle_error(e, errors[e], d)
+ oe.qa.handle_error(e, errors[e], d)
def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
# Don't do this check for kernel/module recipes, there aren't too many debug/development
@@ -746,10 +713,10 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
for rdepend in rdepends:
if "-dbg" in rdepend and "debug-deps" not in skip:
error_msg = "%s rdepends on %s" % (pkg,rdepend)
- package_qa_handle_error("debug-deps", error_msg, d)
+ oe.qa.handle_error("debug-deps", error_msg, d)
if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip:
error_msg = "%s rdepends on %s" % (pkg, rdepend)
- package_qa_handle_error("dev-deps", error_msg, d)
+ oe.qa.handle_error("dev-deps", error_msg, d)
if rdepend not in packages:
rdep_data = oe.packagedata.read_subpkgdata(rdepend, d)
if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps:
@@ -770,7 +737,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
error_msg = "%s rdepends on %s, but it isn't a build dependency, missing %s in DEPENDS or PACKAGECONFIG?" % (pkg, rdepend, rdep_data['PN'])
else:
error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend)
- package_qa_handle_error("build-deps", error_msg, d)
+ oe.qa.handle_error("build-deps", error_msg, d)
if "file-rdeps" not in skip:
ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)'])
@@ -780,7 +747,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
filerdepends = {}
rdep_data = oe.packagedata.read_subpkgdata(pkg, d)
for key in rdep_data:
- if key.startswith("FILERDEPENDS_"):
+ if key.startswith("FILERDEPENDS:"):
for subkey in bb.utils.explode_deps(rdep_data[key]):
if subkey not in ignored_file_rdeps and \
not subkey.startswith('perl('):
@@ -823,7 +790,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
for key in filerdepends:
error_msg = "%s contained in package %s requires %s, but no providers found in RDEPENDS:%s?" % \
(filerdepends[key].replace(":%s" % pkg, "").replace("@underscore@", "_"), pkg, key, pkg)
- package_qa_handle_error("file-rdeps", error_msg, d)
+ oe.qa.handle_error("file-rdeps", error_msg, d)
package_qa_check_rdepends[vardepsexclude] = "OVERRIDES"
def package_qa_check_deps(pkg, pkgdest, d):
@@ -840,7 +807,7 @@ def package_qa_check_deps(pkg, pkgdest, d):
for v in rvar[dep]:
if v and not v.startswith(('< ', '= ', '> ', '<= ', '>=')):
error_msg = "%s:%s is invalid: %s (%s) only comparisons <, =, >, <=, and >= are allowed" % (var, pkg, dep, v)
- package_qa_handle_error("dep-cmp", error_msg, d)
+ oe.qa.handle_error("dep-cmp", error_msg, d)
check_valid_deps('RDEPENDS')
check_valid_deps('RRECOMMENDS')
@@ -851,13 +818,14 @@ def package_qa_check_deps(pkg, pkgdest, d):
QAPKGTEST[usrmerge] = "package_qa_check_usrmerge"
def package_qa_check_usrmerge(pkg, d, messages):
+
pkgdest = d.getVar('PKGDEST')
pkg_dir = pkgdest + os.sep + pkg + os.sep
merged_dirs = ['bin', 'sbin', 'lib'] + d.getVar('MULTILIB_VARIANTS').split()
for f in merged_dirs:
if os.path.exists(pkg_dir + f) and not os.path.islink(pkg_dir + f):
msg = "%s package is not obeying usrmerge distro feature. /%s should be relocated to /usr." % (pkg, f)
- package_qa_add_message(messages, "usrmerge", msg)
+ oe.qa.add_message(messages, "usrmerge", msg)
return False
return True
@@ -876,7 +844,7 @@ def package_qa_check_perllocalpod(pkg, d, messages):
if matches:
matches = [package_qa_clean_path(path, d, pkg) for path in matches]
msg = "%s contains perllocal.pod (%s), should not be installed" % (pkg, " ".join(matches))
- package_qa_add_message(messages, "perllocalpod", msg)
+ oe.qa.add_message(messages, "perllocalpod", msg)
QAPKGTEST[expanded-d] = "package_qa_check_expanded_d"
def package_qa_check_expanded_d(package, d, messages):
@@ -891,10 +859,10 @@ def package_qa_check_expanded_d(package, d, messages):
bbvar = d.getVar(var + ":" + package) or ""
if expanded_d in bbvar:
if var == 'FILES':
- package_qa_add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % package)
+ oe.qa.add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % package)
sane = False
else:
- package_qa_add_message(messages, "expanded-d", "%s in %s recipe contains ${D}, it should be replaced by $D instead" % (var, package))
+ oe.qa.add_message(messages, "expanded-d", "%s in %s recipe contains ${D}, it should be replaced by $D instead" % (var, package))
sane = False
return sane
@@ -912,7 +880,7 @@ def package_qa_check_unlisted_pkg_lics(package, d, messages):
if not unlisted:
return True
- package_qa_add_message(messages, "unlisted-pkg-lics",
+ oe.qa.add_message(messages, "unlisted-pkg-lics",
"LICENSE:%s includes licenses (%s) that are not "
"listed in LICENSE" % (package, ' '.join(unlisted)))
return False
@@ -927,7 +895,7 @@ def package_qa_check_encoding(keys, encode, d):
except UnicodeDecodeError as e:
error_msg = "%s has non %s characters" % (key,enc)
sane = False
- package_qa_handle_error("invalid-chars", error_msg, d)
+ oe.qa.handle_error("invalid-chars", error_msg, d)
return sane
for key in keys:
@@ -960,12 +928,12 @@ def package_qa_check_host_user(path, name, d, elf, messages):
else:
check_uid = int(d.getVar('HOST_USER_UID'))
if stat.st_uid == check_uid:
- package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by uid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_uid))
+ oe.qa.add_message(messages, "host-user-contaminated", "%s: %s is owned by uid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_uid))
return False
check_gid = int(d.getVar('HOST_USER_GID'))
if stat.st_gid == check_gid:
- package_qa_add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid))
+ oe.qa.add_message(messages, "host-user-contaminated", "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, package_qa_clean_path(path, d, name), check_gid))
return False
return True
@@ -974,11 +942,11 @@ def package_qa_check_src_uri(pn, d, messages):
import re
if "${PN}" in d.getVar("SRC_URI", False):
- package_qa_handle_error("src-uri-bad", "%s: SRC_URI uses PN not BPN" % pn, d)
+ oe.qa.handle_error("src-uri-bad", "%s: SRC_URI uses PN not BPN" % pn, d)
for url in d.getVar("SRC_URI").split():
if re.search(r"git(hu|la)b\.com/.+/.+/archive/.+", url):
- package_qa_handle_error("src-uri-bad", "%s: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol" % pn, d)
+ oe.qa.handle_error("src-uri-bad", "%s: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol" % pn, d)
QARECIPETEST[unhandled-features-check] = "package_qa_check_unhandled_features_check"
def package_qa_check_unhandled_features_check(pn, d, messages):
@@ -989,7 +957,7 @@ def package_qa_check_unhandled_features_check(pn, d, messages):
if d.getVar(var) is not None or d.overridedata.get(var) is not None:
var_set = True
if var_set:
- package_qa_handle_error("unhandled-features-check", "%s: recipe doesn't inherit features_check" % pn, d)
+ oe.qa.handle_error("unhandled-features-check", "%s: recipe doesn't inherit features_check" % pn, d)
QARECIPETEST[missing-update-alternatives] = "package_qa_check_missing_update_alternatives"
def package_qa_check_missing_update_alternatives(pn, d, messages):
@@ -997,7 +965,7 @@ def package_qa_check_missing_update_alternatives(pn, d, messages):
# without inheriting update-alternatives class
for pkg in (d.getVar('PACKAGES') or '').split():
if d.getVar('ALTERNATIVE:%s' % pkg) and not bb.data.inherits_class('update-alternatives', d):
- package_qa_handle_error("missing-update-alternatives", "%s: recipe defines ALTERNATIVE:%s but doesn't inherit update-alternatives. This might fail during do_rootfs later!" % (pn, pkg), d)
+ oe.qa.handle_error("missing-update-alternatives", "%s: recipe defines ALTERNATIVE:%s but doesn't inherit update-alternatives. This might fail during do_rootfs later!" % (pn, pkg), d)
# The PACKAGE FUNC to scan each package
python do_package_qa () {
@@ -1073,7 +1041,7 @@ python do_package_qa () {
bb.note("Checking Package: %s" % package)
# Check package name
if not pkgname_pattern.match(package):
- package_qa_handle_error("pkgname",
+ oe.qa.handle_error("pkgname",
"%s doesn't match the [a-z0-9.+-]+ regex" % package, d)
warn_checks, error_checks = parse_test_matrix("QAPATHTEST")
@@ -1091,10 +1059,7 @@ python do_package_qa () {
if 'libdir' in d.getVar("ALL_QA").split():
package_qa_check_libdir(d)
- qa_sane = d.getVar("QA_SANE")
- if not qa_sane:
- bb.fatal("QA run found fatal errors. Please consider fixing them.")
- bb.note("DONE with PACKAGE QA")
+ oe.qa.exit_if_errors(d)
}
# binutils is used for most checks, so need to set as dependency
@@ -1121,8 +1086,8 @@ addtask do_package_qa_setscene
python do_qa_staging() {
bb.note("QA checking staging")
- if not qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'), d):
- bb.fatal("QA staging was broken by the package built above")
+ qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'), d)
+ oe.qa.exit_with_message_if_errors("QA staging was broken by the package built above", d)
}
python do_qa_patch() {
@@ -1170,7 +1135,7 @@ python do_qa_patch() {
elif 'patch-fuzz' in d.getVar('WARN_QA'):
bb.warn(msg)
msg = "Patch log indicates that patches do not apply cleanly."
- package_qa_handle_error("patch-fuzz", msg, d)
+ oe.qa.handle_error("patch-fuzz", msg, d)
}
python do_qa_configure() {
@@ -1198,7 +1163,7 @@ python do_qa_configure() {
if subprocess.call(statement, shell=True) == 0:
error_msg = """This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
Rerun configure task after fixing this."""
- package_qa_handle_error("configure-unsafe", error_msg, d)
+ oe.qa.handle_error("configure-unsafe", error_msg, d)
if "configure.ac" in files:
configs.append(os.path.join(root,"configure.ac"))
@@ -1228,7 +1193,7 @@ Rerun configure task after fixing this."""
gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
if subprocess.call(gnu, shell=True) == 0:
error_msg = "AM_GNU_GETTEXT used but no inherit gettext"
- package_qa_handle_error("configure-gettext", error_msg, d)
+ oe.qa.handle_error("configure-gettext", error_msg, d)
###########################################################################
# Check unrecognised configure options (with a white list)
@@ -1251,7 +1216,7 @@ Rerun configure task after fixing this."""
if options:
pn = d.getVar('PN')
error_msg = pn + ": configure was passed unrecognised options: " + " ".join(options)
- package_qa_handle_error("unknown-configure-option", error_msg, d)
+ oe.qa.handle_error("unknown-configure-option", error_msg, d)
except subprocess.CalledProcessError:
pass
@@ -1263,11 +1228,9 @@ Rerun configure task after fixing this."""
if pconfig not in pkgconfigflags:
pn = d.getVar('PN')
error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pconfig)
- package_qa_handle_error("invalid-packageconfig", error_msg, d)
+ oe.qa.handle_error("invalid-packageconfig", error_msg, d)
- qa_sane = d.getVar("QA_SANE")
- if not qa_sane:
- bb.fatal("Fatal QA errors found, failing task.")
+ oe.qa.exit_if_errors(d)
}
python do_qa_unpack() {
@@ -1320,15 +1283,15 @@ python () {
pn = d.getVar('PN')
if pn in overrides:
msg = 'Recipe %s has PN of "%s" which is in OVERRIDES, this can result in unexpected behaviour.' % (d.getVar("FILE"), pn)
- package_qa_handle_error("pn-overrides", msg, d)
+ oe.qa.handle_error("pn-overrides", msg, d)
prog = re.compile(r'[A-Z]')
if prog.search(pn):
- package_qa_handle_error("uppercase-pn", 'PN: %s is upper case, this can result in unexpected behavior.' % pn, d)
+ oe.qa.handle_error("uppercase-pn", 'PN: %s is upper case, this can result in unexpected behavior.' % pn, d)
# Some people mistakenly use DEPENDS:${PN} instead of DEPENDS and wonder
# why it doesn't work.
if (d.getVar(d.expand('DEPENDS:${PN}'))):
- package_qa_handle_error("pkgvarcheck", "recipe uses DEPENDS:${PN}, should use DEPENDS", d)
+ oe.qa.handle_error("pkgvarcheck", "recipe uses DEPENDS:${PN}, should use DEPENDS", d)
issues = []
if (d.getVar('PACKAGES') or "").split():
@@ -1345,7 +1308,7 @@ python () {
else:
d.setVarFlag('do_package_qa', 'rdeptask', '')
for i in issues:
- package_qa_handle_error("pkgvarcheck", "%s: Variable %s is set as not being package specific, please fix this." % (d.getVar("FILE"), i), d)
+ oe.qa.handle_error("pkgvarcheck", "%s: Variable %s is set as not being package specific, please fix this." % (d.getVar("FILE"), i), d)
if 'native-last' not in (d.getVar('INSANE_SKIP') or "").split():
for native_class in ['native', 'nativesdk']:
@@ -1373,11 +1336,8 @@ python () {
else:
break
if broken_order:
- package_qa_handle_error("native-last", "%s: native/nativesdk class is not inherited last, this can result in unexpected behaviour. "
+ oe.qa.handle_error("native-last", "%s: native/nativesdk class is not inherited last, this can result in unexpected behaviour. "
"Classes inherited after native/nativesdk: %s" % (pn, " ".join(broken_order)), d)
-
- qa_sane = d.getVar("QA_SANE")
- if not qa_sane:
- bb.fatal("Fatal QA errors found, failing task.")
+ oe.qa.exit_if_errors(d)
}
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 38e05153e3..8718ce7e16 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -73,7 +73,7 @@ FIT_SIGN_INDIVIDUAL ?= "0"
#
# $1 ... .its filename
fitimage_emit_fit_header() {
- cat << EOF >> ${1}
+ cat << EOF >> $1
/dts-v1/;
/ {
@@ -94,24 +94,24 @@ EOF
fitimage_emit_section_maint() {
case $2 in
imagestart)
- cat << EOF >> ${1}
+ cat << EOF >> $1
images {
EOF
;;
confstart)
- cat << EOF >> ${1}
+ cat << EOF >> $1
configurations {
EOF
;;
sectend)
- cat << EOF >> ${1}
+ cat << EOF >> $1
};
EOF
;;
fitend)
- cat << EOF >> ${1}
+ cat << EOF >> $1
};
EOF
;;
@@ -137,28 +137,28 @@ fitimage_emit_section_kernel() {
awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'`
fi
- cat << EOF >> ${1}
- kernel-${2} {
+ cat << EOF >> $1
+ kernel-$2 {
description = "Linux kernel";
- data = /incbin/("${3}");
+ data = /incbin/("$3");
type = "kernel";
arch = "${UBOOT_ARCH}";
os = "linux";
- compression = "${4}";
+ compression = "$4";
load = <${UBOOT_LOADADDRESS}>;
- entry = <${ENTRYPOINT}>;
+ entry = <$ENTRYPOINT>;
hash-1 {
- algo = "${kernel_csum}";
+ algo = "$kernel_csum";
};
};
EOF
- if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${kernel_sign_keyname}" ] ; then
- sed -i '$ d' ${1}
- cat << EOF >> ${1}
+ if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$kernel_sign_keyname" ] ; then
+ sed -i '$ d' $1
+ cat << EOF >> $1
signature-1 {
- algo = "${kernel_csum},${kernel_sign_algo}";
- key-name-hint = "${kernel_sign_keyname}";
+ algo = "$kernel_csum,$kernel_sign_algo";
+ key-name-hint = "$kernel_sign_keyname";
};
};
EOF
@@ -186,26 +186,26 @@ fitimage_emit_section_dtb() {
elif [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then
dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"
fi
- cat << EOF >> ${1}
- fdt-${2} {
+ cat << EOF >> $1
+ fdt-$2 {
description = "Flattened Device Tree blob";
- data = /incbin/("${3}");
+ data = /incbin/("$3");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
- ${dtb_loadline}
+ $dtb_loadline
hash-1 {
- algo = "${dtb_csum}";
+ algo = "$dtb_csum";
};
};
EOF
- if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${dtb_sign_keyname}" ] ; then
- sed -i '$ d' ${1}
- cat << EOF >> ${1}
+ if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$dtb_sign_keyname" ] ; then
+ sed -i '$ d' $1
+ cat << EOF >> $1
signature-1 {
- algo = "${dtb_csum},${dtb_sign_algo}";
- key-name-hint = "${dtb_sign_keyname}";
+ algo = "$dtb_csum,$dtb_sign_algo";
+ key-name-hint = "$dtb_sign_keyname";
};
};
EOF
@@ -220,29 +220,29 @@ EOF
# $3 ... Path to boot script image
fitimage_emit_section_boot_script() {
- bootscr_csum="${FIT_HASH_ALG}"
+ bootscr_csum="${FIT_HASH_ALG}"
bootscr_sign_algo="${FIT_SIGN_ALG}"
bootscr_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
- cat << EOF >> ${1}
- bootscr-${2} {
+ cat << EOF >> $1
+ bootscr-$2 {
description = "U-boot script";
- data = /incbin/("${3}");
+ data = /incbin/("$3");
type = "script";
arch = "${UBOOT_ARCH}";
compression = "none";
hash-1 {
- algo = "${bootscr_csum}";
+ algo = "$bootscr_csum";
};
};
EOF
- if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then
- sed -i '$ d' ${1}
- cat << EOF >> ${1}
+ if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$bootscr_sign_keyname" ] ; then
+ sed -i '$ d' $1
+ cat << EOF >> $1
signature-1 {
- algo = "${bootscr_csum},${bootscr_sign_algo}";
- key-name-hint = "${bootscr_sign_keyname}";
+ algo = "$bootscr_csum,$bootscr_sign_algo";
+ key-name-hint = "$bootscr_sign_keyname";
};
};
EOF
@@ -259,10 +259,10 @@ fitimage_emit_section_setup() {
setup_csum="${FIT_HASH_ALG}"
- cat << EOF >> ${1}
- setup-${2} {
+ cat << EOF >> $1
+ setup-$2 {
description = "Linux setup.bin";
- data = /incbin/("${3}");
+ data = /incbin/("$3");
type = "x86_setup";
arch = "${UBOOT_ARCH}";
os = "linux";
@@ -270,7 +270,7 @@ fitimage_emit_section_setup() {
load = <0x00090000>;
entry = <0x00090000>;
hash-1 {
- algo = "${setup_csum}";
+ algo = "$setup_csum";
};
};
EOF
@@ -297,28 +297,28 @@ fitimage_emit_section_ramdisk() {
ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;"
fi
- cat << EOF >> ${1}
- ramdisk-${2} {
+ cat << EOF >> $1
+ ramdisk-$2 {
description = "${INITRAMFS_IMAGE}";
- data = /incbin/("${3}");
+ data = /incbin/("$3");
type = "ramdisk";
arch = "${UBOOT_ARCH}";
os = "linux";
compression = "none";
- ${ramdisk_loadline}
- ${ramdisk_entryline}
+ $ramdisk_loadline
+ $ramdisk_entryline
hash-1 {
- algo = "${ramdisk_csum}";
+ algo = "$ramdisk_csum";
};
};
EOF
- if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${ramdisk_sign_keyname}" ] ; then
- sed -i '$ d' ${1}
- cat << EOF >> ${1}
+ if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$ramdisk_sign_keyname" ] ; then
+ sed -i '$ d' $1
+ cat << EOF >> $1
signature-1 {
- algo = "${ramdisk_csum},${ramdisk_sign_algo}";
- key-name-hint = "${ramdisk_sign_keyname}";
+ algo = "$ramdisk_csum,$ramdisk_sign_algo";
+ key-name-hint = "$ramdisk_sign_keyname";
};
};
EOF
@@ -343,13 +343,13 @@ fitimage_emit_section_config() {
conf_sign_keyname="${UBOOT_SIGN_KEYNAME}"
fi
- its_file="${1}"
- kernel_id="${2}"
- dtb_image="${3}"
- ramdisk_id="${4}"
- bootscr_id="${5}"
- config_id="${6}"
- default_flag="${7}"
+ its_file="$1"
+ kernel_id="$2"
+ dtb_image="$3"
+ ramdisk_id="$4"
+ bootscr_id="$5"
+ config_id="$6"
+ default_flag="$7"
# Test if we have any DTBs at all
sep=""
@@ -364,106 +364,106 @@ fitimage_emit_section_config() {
# conf node name is selected based on dtb ID if it is present,
# otherwise its selected based on kernel ID
- if [ -n "${dtb_image}" ]; then
- conf_node=$conf_node${dtb_image}
+ if [ -n "$dtb_image" ]; then
+ conf_node=$conf_node$dtb_image
else
- conf_node=$conf_node${kernel_id}
+ conf_node=$conf_node$kernel_id
fi
- if [ -n "${kernel_id}" ]; then
+ if [ -n "$kernel_id" ]; then
conf_desc="Linux kernel"
sep=", "
- kernel_line="kernel = \"kernel-${kernel_id}\";"
+ kernel_line="kernel = \"kernel-$kernel_id\";"
fi
- if [ -n "${dtb_image}" ]; then
- conf_desc="${conf_desc}${sep}FDT blob"
+ if [ -n "$dtb_image" ]; then
+ conf_desc="$conf_desc${sep}FDT blob"
sep=", "
- fdt_line="fdt = \"fdt-${dtb_image}\";"
+ fdt_line="fdt = \"fdt-$dtb_image\";"
fi
- if [ -n "${ramdisk_id}" ]; then
- conf_desc="${conf_desc}${sep}ramdisk"
+ if [ -n "$ramdisk_id" ]; then
+ conf_desc="$conf_desc${sep}ramdisk"
sep=", "
- ramdisk_line="ramdisk = \"ramdisk-${ramdisk_id}\";"
+ ramdisk_line="ramdisk = \"ramdisk-$ramdisk_id\";"
fi
- if [ -n "${bootscr_id}" ]; then
- conf_desc="${conf_desc}${sep}u-boot script"
+ if [ -n "$bootscr_id" ]; then
+ conf_desc="$conf_desc${sep}u-boot script"
sep=", "
- bootscr_line="bootscr = \"bootscr-${bootscr_id}\";"
+ bootscr_line="bootscr = \"bootscr-$bootscr_id\";"
fi
- if [ -n "${config_id}" ]; then
- conf_desc="${conf_desc}${sep}setup"
- setup_line="setup = \"setup-${config_id}\";"
+ if [ -n "$config_id" ]; then
+ conf_desc="$conf_desc${sep}setup"
+ setup_line="setup = \"setup-$config_id\";"
fi
- if [ "${default_flag}" = "1" ]; then
+ if [ "$default_flag" = "1" ]; then
# default node is selected based on dtb ID if it is present,
# otherwise its selected based on kernel ID
- if [ -n "${dtb_image}" ]; then
- default_line="default = \"conf-${dtb_image}\";"
+ if [ -n "$dtb_image" ]; then
+ default_line="default = \"conf-$dtb_image\";"
else
- default_line="default = \"conf-${kernel_id}\";"
+ default_line="default = \"conf-$kernel_id\";"
fi
fi
- cat << EOF >> ${its_file}
- ${default_line}
+ cat << EOF >> $its_file
+ $default_line
$conf_node {
- description = "${default_flag} ${conf_desc}";
- ${kernel_line}
- ${fdt_line}
- ${ramdisk_line}
- ${bootscr_line}
- ${setup_line}
+ description = "$default_flag $conf_desc";
+ $kernel_line
+ $fdt_line
+ $ramdisk_line
+ $bootscr_line
+ $setup_line
hash-1 {
- algo = "${conf_csum}";
+ algo = "$conf_csum";
};
EOF
- if [ ! -z "${conf_sign_keyname}" ] ; then
+ if [ -n "$conf_sign_keyname" ] ; then
sign_line="sign-images = "
sep=""
- if [ -n "${kernel_id}" ]; then
- sign_line="${sign_line}${sep}\"kernel\""
+ if [ -n "$kernel_id" ]; then
+ sign_line="$sign_line${sep}\"kernel\""
sep=", "
fi
- if [ -n "${dtb_image}" ]; then
- sign_line="${sign_line}${sep}\"fdt\""
+ if [ -n "$dtb_image" ]; then
+ sign_line="$sign_line${sep}\"fdt\""
sep=", "
fi
- if [ -n "${ramdisk_id}" ]; then
- sign_line="${sign_line}${sep}\"ramdisk\""
+ if [ -n "$ramdisk_id" ]; then
+ sign_line="$sign_line${sep}\"ramdisk\""
sep=", "
fi
- if [ -n "${bootscr_id}" ]; then
- sign_line="${sign_line}${sep}\"bootscr\""
+ if [ -n "$bootscr_id" ]; then
+ sign_line="$sign_line${sep}\"bootscr\""
sep=", "
fi
- if [ -n "${config_id}" ]; then
- sign_line="${sign_line}${sep}\"setup\""
+ if [ -n "$config_id" ]; then
+ sign_line="$sign_line${sep}\"setup\""
fi
- sign_line="${sign_line};"
+ sign_line="$sign_line;"
- cat << EOF >> ${its_file}
+ cat << EOF >> $its_file
signature-1 {
- algo = "${conf_csum},${conf_sign_algo}";
- key-name-hint = "${conf_sign_keyname}";
- ${sign_line}
+ algo = "$conf_csum,$conf_sign_algo";
+ key-name-hint = "$conf_sign_keyname";
+ $sign_line
};
EOF
fi
- cat << EOF >> ${its_file}
+ cat << EOF >> $its_file
};
EOF
}
@@ -478,39 +478,24 @@ fitimage_assemble() {
kernelcount=1
dtbcount=""
DTBS=""
- ramdiskcount=${3}
+ ramdiskcount=$3
setupcount=""
bootscr_id=""
- rm -f ${1} arch/${ARCH}/boot/${2}
+ rm -f $1 arch/${ARCH}/boot/$2
- if [ ! -z "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
+ if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
bbfatal "Keys used to sign images and configuration nodes must be different."
fi
- fitimage_emit_fit_header ${1}
+ fitimage_emit_fit_header $1
#
# Step 1: Prepare a kernel image section.
#
- fitimage_emit_section_maint ${1} imagestart
+ fitimage_emit_section_maint $1 imagestart
uboot_prep_kimage
-
- if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
- initramfs_bundle_path="arch/"${UBOOT_ARCH}"/boot/"${KERNEL_IMAGETYPE_REPLACEMENT}".initramfs"
- if [ -e "${initramfs_bundle_path}" ]; then
-
- #
- # Include the kernel/rootfs bundle.
- #
-
- fitimage_emit_section_kernel ${1} "${kernelcount}" "${initramfs_bundle_path}" "${linux_comp}"
- else
- bbwarn "${initramfs_bundle_path} not found."
- fi
- else
- fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}"
- fi
+ fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
#
# Step 2: Prepare a DTB image section
@@ -519,9 +504,9 @@ fitimage_assemble() {
if [ -n "${KERNEL_DEVICETREE}" ]; then
dtbcount=1
for DTB in ${KERNEL_DEVICETREE}; do
- if echo ${DTB} | grep -q '/dts/'; then
- bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
- DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
+ if echo $DTB | grep -q '/dts/'; then
+ bbwarn "$DTB contains the full path to the the dts file, but only the dtb name should be used."
+ DTB=`basename $DTB | sed 's,\.dts$,.dtb,g'`
fi
# Skip ${DTB} if it's also provided in ${EXTERNAL_KERNEL_DEVICETREE}
@@ -529,23 +514,23 @@ fitimage_assemble() {
continue
fi
- DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
- if [ ! -e "${DTB_PATH}" ]; then
- DTB_PATH="arch/${ARCH}/boot/${DTB}"
+ DTB_PATH="arch/${ARCH}/boot/dts/$DTB"
+ if [ ! -e "$DTB_PATH" ]; then
+ DTB_PATH="arch/${ARCH}/boot/$DTB"
fi
- DTB=$(echo "${DTB}" | tr '/' '_')
- DTBS="${DTBS} ${DTB}"
- fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
+ DTB=$(echo "$DTB" | tr '/' '_')
+ DTBS="$DTBS $DTB"
+ fitimage_emit_section_dtb $1 $DTB $DTB_PATH
done
fi
if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
dtbcount=1
for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
- DTB=$(echo "${DTB}" | tr '/' '_')
- DTBS="${DTBS} ${DTB}"
- fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"
+ DTB=$(echo "$DTB" | tr '/' '_')
+ DTBS="$DTBS $DTB"
+ fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/$DTB"
done
fi
@@ -557,7 +542,7 @@ fitimage_assemble() {
if [ -e "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY}" ]; then
cp ${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} ${B}
bootscr_id="${UBOOT_ENV_BINARY}"
- fitimage_emit_section_boot_script ${1} "${bootscr_id}" ${UBOOT_ENV_BINARY}
+ fitimage_emit_section_boot_script $1 "$bootscr_id" ${UBOOT_ENV_BINARY}
else
bbwarn "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} not found."
fi
@@ -568,7 +553,7 @@ fitimage_assemble() {
#
if [ -e arch/${ARCH}/boot/setup.bin ]; then
setupcount=1
- fitimage_emit_section_setup ${1} "${setupcount}" arch/${ARCH}/boot/setup.bin
+ fitimage_emit_section_setup $1 $setupcount arch/${ARCH}/boot/setup.bin
fi
#
@@ -577,27 +562,30 @@ fitimage_assemble() {
if [ "x${ramdiskcount}" = "x1" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
# Find and use the first initramfs image archive type we find
for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio; do
- initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}"
- echo "Using $initramfs_path"
- if [ -e "${initramfs_path}" ]; then
- fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" "${initramfs_path}"
+ initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
+ echo -n "Searching for $initramfs_path..."
+ if [ -e "$initramfs_path" ]; then
+ echo "found"
+ fitimage_emit_section_ramdisk $1 "$ramdiskcount" "$initramfs_path"
break
+ else
+ echo "not found"
fi
done
fi
- fitimage_emit_section_maint ${1} sectend
+ fitimage_emit_section_maint $1 sectend
# Force the first Kernel and DTB in the default config
kernelcount=1
- if [ -n "${dtbcount}" ]; then
+ if [ -n "$dtbcount" ]; then
dtbcount=1
fi
#
# Step 6: Prepare a configurations section
#
- fitimage_emit_section_maint ${1} confstart
+ fitimage_emit_section_maint $1 confstart
# kernel-fitimage.bbclass currently only supports a single kernel (no less or
# more) to be added to the FIT image along with 0 or more device trees and
@@ -608,33 +596,33 @@ fitimage_assemble() {
# the default configuration to be used is based on the dtbcount. If there is
# no dtb present than select the default configuation to be based on
# the kernelcount.
- if [ -n "${DTBS}" ]; then
+ if [ -n "$DTBS" ]; then
i=1
for DTB in ${DTBS}; do
dtb_ext=${DTB##*.}
- if [ "${dtb_ext}" = "dtbo" ]; then
- fitimage_emit_section_config ${1} "" "${DTB}" "" "${bootscr_id}" "" "`expr ${i} = ${dtbcount}`"
+ if [ "$dtb_ext" = "dtbo" ]; then
+ fitimage_emit_section_config $1 "" "$DTB" "" "$bootscr_id" "" "`expr $i = $dtbcount`"
else
- fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${bootscr_id}" "${setupcount}" "`expr ${i} = ${dtbcount}`"
+ fitimage_emit_section_config $1 $kernelcount "$DTB" "$ramdiskcount" "$bootscr_id" "$setupcount" "`expr $i = $dtbcount`"
fi
- i=`expr ${i} + 1`
+ i=`expr $i + 1`
done
else
defaultconfigcount=1
- fitimage_emit_section_config ${1} "${kernelcount}" "" "${ramdiskcount}" "${bootscr_id}" "${setupcount}" "${defaultconfigcount}"
+ fitimage_emit_section_config $1 $kernelcount "" "$ramdiskcount" "$bootscr_id" "$setupcount" $defaultconfigcount
fi
- fitimage_emit_section_maint ${1} sectend
+ fitimage_emit_section_maint $1 sectend
- fitimage_emit_section_maint ${1} fitend
+ fitimage_emit_section_maint $1 fitend
#
# Step 7: Assemble the image
#
${UBOOT_MKIMAGE} \
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
- -f ${1} \
- arch/${ARCH}/boot/${2}
+ -f $1 \
+ arch/${ARCH}/boot/$2
#
# Step 8: Sign the image and add public key to U-Boot dtb
@@ -651,7 +639,7 @@ fitimage_assemble() {
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-F -k "${UBOOT_SIGN_KEYDIR}" \
$add_key_to_u_boot \
- -r arch/${ARCH}/boot/${2} \
+ -r arch/${ARCH}/boot/$2 \
${UBOOT_MKIMAGE_SIGN_ARGS}
fi
}
@@ -659,7 +647,7 @@ fitimage_assemble() {
do_assemble_fitimage() {
if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
cd ${B}
- fitimage_assemble fit-image.its fitImage
+ fitimage_assemble fit-image.its fitImage ""
fi
}
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 549dfd97a4..1d5a8cdf29 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -36,7 +36,10 @@ def find_patches(d,subdir):
if subdir == patchdir:
patch_list.append(local)
else:
- patch_list.append(local)
+ # skip the patch if a patchdir was supplied, it won't be handled
+ # properly
+ if not patchdir:
+ patch_list.append(local)
return patch_list
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d13c38fb02..c6a80950d6 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -77,7 +77,7 @@ python __anonymous () {
# KERNEL_IMAGETYPES may contain a mixture of image types supported directly
# by the kernel build system and types which are created by post-processing
# the output of the kernel build system (e.g. compressing vmlinux ->
- # vmlinux.gz in kernel_do_compile()).
+ # vmlinux.gz in kernel_do_transform_kernel()).
# KERNEL_IMAGETYPE_FOR_MAKE should contain only image types supported
# directly by the kernel build system.
if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
@@ -134,6 +134,8 @@ set -e
# standalone for use by wic and other tools.
if image:
d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
+ if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
+ bb.build.addtask('do_transform_bundled_initramfs', 'do_deploy', 'do_bundle_initramfs', d)
# NOTE: setting INITRAMFS_TASK is for backward compatibility
# The preferred method is to set INITRAMFS_IMAGE, because
@@ -226,8 +228,8 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
# Some Linux kernel configurations need additional parameters on the command line
KERNEL_EXTRA_ARGS ?= ""
-EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
-EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_LDFLAGS}""
+EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
+EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}""
KERNEL_ALT_IMAGETYPE ??= ""
@@ -316,24 +318,25 @@ do_bundle_initramfs () {
}
do_bundle_initramfs[dirs] = "${B}"
+kernel_do_transform_bundled_initramfs() {
+ # vmlinux.gz is not built by kernel
+ if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
+ gzip -9cn < ${KERNEL_OUTPUT_DIR}/vmlinux.initramfs > ${KERNEL_OUTPUT_DIR}/vmlinux.gz.initramfs
+ fi
+}
+do_transform_bundled_initramfs[dirs] = "${B}"
+
python do_devshell:prepend () {
os.environ["LDFLAGS"] = ''
}
addtask bundle_initramfs after do_install before do_deploy
-get_cc_option () {
- # Check if KERNEL_CC supports the option "file-prefix-map".
- # This option allows us to build images with __FILE__ values that do not
- # contain the host build path.
- if ${KERNEL_CC} -Q --help=joined | grep -q "\-ffile-prefix-map=<old=new>"; then
- echo "-ffile-prefix-map=${S}=/kernel-source/"
- fi
-}
+KERNEL_DEBUG_TIMESTAMPS ??= "0"
kernel_do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
+ if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
# kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
# be set....
if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
@@ -361,20 +364,24 @@ kernel_do_compile() {
copy_initramfs
use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
fi
- cc_extra=$(get_cc_option)
for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
- oe_runmake ${typeformake} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
+ oe_runmake ${typeformake} CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
done
+}
+
+kernel_do_transform_kernel() {
# vmlinux.gz is not built by kernel
if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
mkdir -p "${KERNEL_OUTPUT_DIR}"
gzip -9cn < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz"
fi
}
+do_transform_kernel[dirs] = "${B}"
+addtask transform_kernel after do_compile before do_install
do_compile_kernelmodules() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
+ if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
# kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
# be set....
if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
@@ -390,8 +397,7 @@ do_compile_kernelmodules() {
bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
fi
if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
- cc_extra=$(get_cc_option)
- oe_runmake -C ${B} ${PARALLEL_MAKE} modules CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
+ oe_runmake -C ${B} ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
# Module.symvers gets updated during the
# building of the kernel modules. We need to
@@ -623,7 +629,7 @@ inherit cml1
KCONFIG_CONFIG_COMMAND:append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'"
-EXPORT_FUNCTIONS do_compile do_install do_configure
+EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure
# kernel-base becomes kernel-${KERNEL_VERSION}
# kernel-image becomes kernel-image-${KERNEL_VERSION}
@@ -774,7 +780,7 @@ kernel_do_deploy() {
fi
if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
- for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
+ for imageType in ${KERNEL_IMAGETYPES} ; do
if [ "$imageType" = "fitImage" ] ; then
continue
fi
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 7a661d44bd..13ef8cdc0d 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -355,7 +355,7 @@ python package_do_split_gconvs () {
m.write("\t@echo 'Progress %d/%d'\n" % (i, total))
m.write("\t" + makerecipe + "\n\n")
d.setVar("EXTRA_OEMAKE", "-C %s ${PARALLEL_MAKE}" % (os.path.dirname(makefile)))
- d.setVarFlag("oe_runmake", "progress", "outof:Progress\s(\d+)/(\d+)")
+ d.setVarFlag("oe_runmake", "progress", r"outof:Progress\s(\d+)/(\d+)")
bb.note("Executing binary locale generation makefile")
bb.build.exec_func("oe_runmake", d)
bb.note("collecting binary locales from locale tree")
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 45d912741d..d5480d87e2 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -29,6 +29,7 @@ python do_populate_lic() {
with open(os.path.join(destdir, "recipeinfo"), "w") as f:
for key in sorted(info.keys()):
f.write("%s: %s\n" % (key, info[key]))
+ oe.qa.exit_if_errors(d)
}
PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '') + ' ' + d.getVar('COREBASE') + '/meta/COPYING').split())}"
@@ -145,6 +146,10 @@ def find_license_files(d):
find_license(node.s.replace("+", "").replace("*", ""))
self.generic_visit(node)
+ def visit_Constant(self, node):
+ find_license(node.value.replace("+", "").replace("*", ""))
+ self.generic_visit(node)
+
def find_license(license_type):
try:
bb.utils.mkdirhier(gen_lic_dest)
@@ -178,7 +183,8 @@ def find_license_files(d):
# The user may attempt to use NO_GENERIC_LICENSE for a generic license which doesn't make sense
# and should not be allowed, warn the user in this case.
if d.getVarFlag('NO_GENERIC_LICENSE', license_type):
- bb.warn("%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it." % (pn, license_type))
+ oe.qa.handle_error("license-no-generic",
+ "%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it." % (pn, license_type), d)
elif non_generic_lic and non_generic_lic in lic_chksums:
# if NO_GENERIC_LICENSE is set, we copy the license files from the fetched source
@@ -190,7 +196,8 @@ def find_license_files(d):
# Add explicity avoid of CLOSED license because this isn't generic
if license_type != 'CLOSED':
# And here is where we warn people that their licenses are lousy
- bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type))
+ oe.qa.handle_error("license-exists",
+ "%s: No generic license file exists for: %s in any provider" % (pn, license_type), d)
pass
if not generic_directory:
@@ -215,7 +222,8 @@ def find_license_files(d):
except oe.license.InvalidLicense as exc:
bb.fatal('%s: %s' % (d.getVar('PF'), exc))
except SyntaxError:
- bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF')))
+ oe.qa.handle_error("license-syntax",
+ "%s: Failed to parse it's LICENSE field." % (d.getVar('PF')), d)
# Add files from LIC_FILES_CHKSUM to list of license files
lic_chksum_paths = defaultdict(OrderedDict)
for path, data in sorted(lic_chksums.items()):
@@ -406,14 +414,16 @@ def check_license_format(d):
for pos, element in enumerate(elements):
if license_pattern.match(element):
if pos > 0 and license_pattern.match(elements[pos - 1]):
- bb.warn('%s: LICENSE value "%s" has an invalid format - license names ' \
+ oe.qa.handle_error('license-format',
+ '%s: LICENSE value "%s" has an invalid format - license names ' \
'must be separated by the following characters to indicate ' \
'the license selection: %s' %
- (pn, licenses, license_operator_chars))
+ (pn, licenses, license_operator_chars), d)
elif not license_operator.match(element):
- bb.warn('%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \
+ oe.qa.handle_error('license-format',
+ '%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \
'in the valid list of separators (%s)' %
- (pn, licenses, element, license_operator_chars))
+ (pn, licenses, element, license_operator_chars), d)
SSTATETASKS += "do_populate_lic"
do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass
index 5490d121f1..bf70bee99b 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -75,7 +75,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
pkg_dic[pkg]["LICENSES"] = re.sub(r' *', ' ', pkg_dic[pkg]["LICENSES"])
pkg_dic[pkg]["LICENSES"] = pkg_dic[pkg]["LICENSES"].split()
if pkg in whitelist:
- bb.warn("Including %s with an incompatible license %s into the image, because it has been whitelisted." %(pkg, pkg_dic[pkg]["LICENSE"]))
+ oe.qa.handle_error('license-incompatible', "Including %s with an incompatible license %s into the image, because it has been whitelisted." %(pkg, pkg_dic[pkg]["LICENSE"]), d)
if not "IMAGE_MANIFEST" in pkg_dic[pkg]:
# Rootfs manifest
@@ -105,10 +105,10 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
continue
if not os.path.exists(lic_file):
- bb.warn("The license listed %s was not in the "\
- "licenses collected for recipe %s"
- % (lic, pkg_dic[pkg]["PN"]))
-
+ oe.qa.handle_error('license-file-missing',
+ "The license listed %s was not in the "\
+ "licenses collected for recipe %s"
+ % (lic, pkg_dic[pkg]["PN"]), d)
# Two options here:
# - Just copy the manifest
# - Copy the manifest and the license directories
@@ -274,6 +274,7 @@ do_rootfs[recrdeptask] += "do_populate_lic"
python do_populate_lic_deploy() {
license_deployed_manifest(d)
+ oe.qa.exit_if_errors(d)
}
addtask populate_lic_deploy before do_build after do_image_complete
diff --git a/meta/classes/meta.bbclass b/meta/classes/meta.bbclass
deleted file mode 100644
index 5e6890238b..0000000000
--- a/meta/classes/meta.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-
-PACKAGES = ""
-
-do_build[recrdeptask] = "do_build"
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index ba325a658b..1afce92147 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -29,7 +29,6 @@ ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \
ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR}/gnutls \n \
-http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ \n \
http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/ http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/ \n \
${APACHE_MIRROR} http://www.us.apache.org/dist \n \
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 3cbda5d806..73ad2ab7b3 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -196,7 +196,7 @@ PACKAGEFUNCS:append = " do_package_qa_multilib"
python do_package_qa_multilib() {
def check_mlprefix(pkg, var, mlprefix):
- values = bb.utils.explode_deps(d.getVar('%s_%s' % (var, pkg)) or d.getVar(var) or "")
+ values = bb.utils.explode_deps(d.getVar('%s:%s' % (var, pkg)) or d.getVar(var) or "")
candidates = []
for i in values:
if i.startswith('virtual/'):
@@ -210,7 +210,7 @@ python do_package_qa_multilib() {
if len(candidates) > 0:
msg = "%s package %s - suspicious values '%s' in %s" \
% (d.getVar('PN'), pkg, ' '.join(candidates), var)
- package_qa_handle_error("multilib", msg, d)
+ oe.qa.handle_error("multilib", msg, d)
ml = d.getVar('MLPREFIX')
if not ml:
@@ -228,4 +228,5 @@ python do_package_qa_multilib() {
check_mlprefix(pkg, 'RSUGGESTS', ml)
check_mlprefix(pkg, 'RREPLACES', ml)
check_mlprefix(pkg, 'RCONFLICTS', ml)
+ oe.qa.exit_if_errors(d)
}
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index c66de8c787..14e210562f 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -31,7 +31,7 @@ PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}"
DEPENDS:append = " chrpath-replacement-native"
EXTRANATIVEPATH += "chrpath-native"
-PKGDATA_DIR = "${TMPDIR}/pkgdata/${SDK_SYS}"
+PKGDATA_DIR = "${PKGDATA_DIR_SDK}"
HOST_ARCH = "${SDK_ARCH}"
HOST_VENDOR = "${SDK_VENDOR}"
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 91a2321116..547c531883 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -22,8 +22,12 @@ inherit python3native
DEPENDS:prepend = "nodejs-native "
RDEPENDS:${PN}:append:class-target = " nodejs"
+EXTRA_OENPM = ""
+
NPM_INSTALL_DEV ?= "0"
+NPM_NODEDIR ?= "${RECIPE_SYSROOT_NATIVE}${prefix_native}"
+
def npm_target_arch_map(target_arch):
"""Maps arch names to npm arch names"""
import re
@@ -57,8 +61,8 @@ def npm_pack(env, srcdir, workdir):
"""Run 'npm pack' on a specified directory"""
import shlex
cmd = "npm pack %s" % shlex.quote(srcdir)
- configs = [("ignore-scripts", "true")]
- tarball = env.run(cmd, configs=configs, workdir=workdir).strip("\n")
+ args = [("ignore-scripts", "true")]
+ tarball = env.run(cmd, args=args, workdir=workdir).strip("\n")
return os.path.join(workdir, tarball)
python npm_do_configure() {
@@ -224,15 +228,11 @@ python npm_do_compile() {
bb.utils.remove(d.getVar("NPM_BUILD"), recurse=True)
- env = NpmEnvironment(d, configs=npm_global_configs(d))
-
- dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False)
-
with tempfile.TemporaryDirectory() as tmpdir:
args = []
- configs = []
+ configs = npm_global_configs(d)
- if dev:
+ if bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False):
configs.append(("also", "development"))
else:
configs.append(("only", "production"))
@@ -247,20 +247,19 @@ python npm_do_compile() {
# Add node-gyp configuration
configs.append(("arch", d.getVar("NPM_ARCH")))
configs.append(("release", "true"))
- nodedir = d.getVar("NPM_NODEDIR")
- if not nodedir:
- sysroot = d.getVar("RECIPE_SYSROOT_NATIVE")
- nodedir = os.path.join(sysroot, d.getVar("prefix_native").strip("/"))
- configs.append(("nodedir", nodedir))
+ configs.append(("nodedir", d.getVar("NPM_NODEDIR")))
configs.append(("python", d.getVar("PYTHON")))
+ env = NpmEnvironment(d, configs)
+
# Add node-pre-gyp configuration
args.append(("target_arch", d.getVar("NPM_ARCH")))
args.append(("build-from-source", "true"))
# Pack and install the main package
tarball = npm_pack(env, d.getVar("NPM_PACKAGE"), tmpdir)
- env.run("npm install %s" % shlex.quote(tarball), args=args, configs=configs)
+ cmd = "npm install %s %s" % (shlex.quote(tarball), d.getVar("EXTRA_OENPM"))
+ env.run(cmd, args=args, configs=configs)
}
npm_do_install() {
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3a78e48da4..92eba98892 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -41,8 +41,6 @@
inherit packagedata
inherit chrpath
inherit package_pkgdata
-
-# Need the package_qa_handle_error() in insane.bbclass
inherit insane
PKGD = "${WORKDIR}/package"
@@ -865,7 +863,7 @@ python fixup_perms () {
self._setdir(lsplit[0], lsplit[1], lsplit[2], lsplit[3], lsplit[4], lsplit[5], lsplit[6], lsplit[7])
else:
msg = "Fixup Perms: invalid config line %s" % line
- package_qa_handle_error("perm-config", msg, d)
+ oe.qa.handle_error("perm-config", msg, d)
self.path = None
self.link = None
@@ -1005,7 +1003,7 @@ python fixup_perms () {
continue
if len(lsplit) != 8 and not (len(lsplit) == 3 and lsplit[1].lower() == "link"):
msg = "Fixup perms: %s invalid line: %s" % (conf, line)
- package_qa_handle_error("perm-line", msg, d)
+ oe.qa.handle_error("perm-line", msg, d)
continue
entry = fs_perms_entry(d.expand(line))
if entry and entry.path:
@@ -1042,7 +1040,7 @@ python fixup_perms () {
ptarget = os.path.join(os.path.dirname(dir), link)
if os.path.exists(target):
msg = "Fixup Perms: Unable to correct directory link, target already exists: %s -> %s" % (dir, ptarget)
- package_qa_handle_error("perm-link", msg, d)
+ oe.qa.handle_error("perm-link", msg, d)
continue
# Create path to move directory to, move it, and then setup the symlink
@@ -1202,7 +1200,7 @@ python split_and_strip_files () {
bb.note("Skipping file %s from %s for already-stripped QA test" % (file[len(dvar):], pn))
else:
msg = "File '%s' from %s was already stripped, this will prevent future debugging!" % (file[len(dvar):], pn)
- package_qa_handle_error("already-stripped", msg, d)
+ oe.qa.handle_error("already-stripped", msg, d)
continue
# At this point we have an unstripped elf file. We need to:
@@ -1362,7 +1360,7 @@ python populate_packages () {
for i, pkg in enumerate(packages):
if pkg in package_dict:
msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg
- package_qa_handle_error("packages-list", msg, d)
+ oe.qa.handle_error("packages-list", msg, d)
# Ensure the source package gets the chance to pick up the source files
# before the debug package by ordering it first in PACKAGES. Whether it
# actually picks up any source files is controlled by
@@ -1399,7 +1397,7 @@ python populate_packages () {
filesvar = d.getVar('FILES:%s' % pkg) or ""
if "//" in filesvar:
msg = "FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg
- package_qa_handle_error("files-invalid", msg, d)
+ oe.qa.handle_error("files-invalid", msg, d)
filesvar.replace("//", "/")
origfiles = filesvar.split()
@@ -1468,7 +1466,7 @@ python populate_packages () {
licenses = d.getVar('LICENSE_EXCLUSION-' + pkg)
if licenses:
msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses)
- package_qa_handle_error("incompatible-license", msg, d)
+ oe.qa.handle_error("incompatible-license", msg, d)
else:
package_list.append(pkg)
d.setVar('PACKAGES', ' '.join(package_list))
@@ -1492,7 +1490,7 @@ python populate_packages () {
msg = msg + "\n " + f
msg = msg + "\nPlease set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.\n"
msg = msg + "%s: %d installed and not shipped files." % (pn, len(unshipped))
- package_qa_handle_error("installed-vs-shipped", msg, d)
+ oe.qa.handle_error("installed-vs-shipped", msg, d)
}
populate_packages[dirs] = "${D}"
@@ -1690,11 +1688,11 @@ fi
val = write_if_exists(sf, pkg, var)
write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
- for dfile in (d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split():
+ for dfile in sorted((d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split()):
write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile)
write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
- for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split():
+ for dfile in sorted((d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split()):
write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile)
sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size))
@@ -1797,9 +1795,9 @@ python package_do_filedeps() {
d.appendVar(key, " " + " ".join(requires[file]))
for pkg in requires_files:
- d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(requires_files[pkg]))
+ d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(sorted(requires_files[pkg])))
for pkg in provides_files:
- d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(provides_files[pkg]))
+ d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(sorted(provides_files[pkg])))
}
SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2"
@@ -1838,7 +1836,7 @@ python package_do_shlibs() {
ver = d.getVar('PKGV')
if not ver:
msg = "PKGV not defined"
- package_qa_handle_error("pkgv-undefined", msg, d)
+ oe.qa.handle_error("pkgv-undefined", msg, d)
return
pkgdest = d.getVar('PKGDEST')
@@ -2112,12 +2110,12 @@ python package_do_pkgconfig () {
for pkg in packages.split():
pkgconfig_provided[pkg] = []
pkgconfig_needed[pkg] = []
- for file in pkgfiles[pkg]:
+ for file in sorted(pkgfiles[pkg]):
m = pc_re.match(file)
if m:
pd = bb.data.init()
name = m.group(1)
- pkgconfig_provided[pkg].append(name)
+ pkgconfig_provided[pkg].append(os.path.basename(name))
if not os.access(file, os.R_OK):
continue
with open(file, 'r') as f:
@@ -2140,7 +2138,7 @@ python package_do_pkgconfig () {
pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist")
if pkgconfig_provided[pkg] != []:
with open(pkgs_file, 'w') as f:
- for p in pkgconfig_provided[pkg]:
+ for p in sorted(pkgconfig_provided[pkg]):
f.write('%s\n' % p)
# Go from least to most specific since the last one found wins
@@ -2402,7 +2400,7 @@ python do_package () {
if not workdir or not outdir or not dest or not dvar or not pn:
msg = "WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package"
- package_qa_handle_error("var-undefined", msg, d)
+ oe.qa.handle_error("var-undefined", msg, d)
return
bb.build.exec_func("package_convert_pr_autoinc", d)
@@ -2455,9 +2453,7 @@ python do_package () {
for f in (d.getVar('PACKAGEFUNCS') or '').split():
bb.build.exec_func(f, d)
- qa_sane = d.getVar("QA_SANE")
- if not qa_sane:
- bb.fatal("Fatal QA errors found, failing task.")
+ oe.qa.exit_if_errors(d)
}
do_package[dirs] = "${SHLIBSWORKDIR} ${PKGDESTWORK} ${D}"
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index eca43e1787..1ae6393d37 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -315,10 +315,7 @@ python do_package_write_deb () {
do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}"
do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}"
do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
-addtask package_write_deb after do_packagedata do_package
-
+addtask package_write_deb after do_packagedata do_package do_deploy_source_date_epoch before do_build
PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot"
PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot"
-
-do_build[recrdeptask] += "do_package_write_deb"
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index c3b53854e8..902b7f94c8 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -230,8 +230,8 @@ def ipk_write_pkg(pkg, d):
shell=True)
if d.getVar('IPK_SIGN_PACKAGES') == '1':
- ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR'))
- ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, d.getVar('PACKAGE_ARCH'))
+ ipkver = "%s-%s" % (localdata.getVar('PKGV'), localdata.getVar('PKGR'))
+ ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, localdata.getVar('PACKAGE_ARCH'))
sign_ipk(d, ipk_to_sign)
finally:
@@ -274,9 +274,7 @@ python do_package_write_ipk () {
do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}"
do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}"
do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
-addtask package_write_ipk after do_packagedata do_package
+addtask package_write_ipk after do_packagedata do_package do_deploy_source_date_epoch before do_build
PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot"
PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot"
-
-do_build[recrdeptask] += "do_package_write_ipk"
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 88d861c0e7..b0754421a3 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -684,8 +684,8 @@ python do_package_rpm () {
cmd = cmd + " --define '_use_internal_dependency_generator 0'"
cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
cmd = cmd + " --define '_build_id_links none'"
- cmd = cmd + " --define '_binary_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS"))
- cmd = cmd + " --define '_source_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS"))
+ cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS"))
+ cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS"))
cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
cmd = cmd + " --define '_buildhost reproducible'"
@@ -748,9 +748,7 @@ python do_package_write_rpm () {
do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}"
do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
-addtask package_write_rpm after do_packagedata do_package
+addtask package_write_rpm after do_packagedata do_package do_deploy_source_date_epoch before do_build
PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot"
PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot"
-
-do_build[recrdeptask] += "do_package_write_rpm"
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 388773a237..fdf3c633bc 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -131,6 +131,9 @@ python patch_do_patch() {
patchdir = parm["patchdir"]
if not os.path.isabs(patchdir):
patchdir = os.path.join(s, patchdir)
+ if not os.path.isdir(patchdir):
+ bb.fatal("Target directory '%s' not found, patchdir '%s' is incorrect in patch file '%s'" %
+ (patchdir, parm["patchdir"], parm['patchname']))
else:
patchdir = s
@@ -147,12 +150,12 @@ python patch_do_patch() {
patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
except Exception as exc:
bb.utils.remove(process_tmpdir, True)
- bb.fatal(str(exc))
+ bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], parm['striplevel'], repr(exc)))
try:
resolver.Resolve()
except bb.BBHandledException as e:
bb.utils.remove(process_tmpdir, True)
- bb.fatal(str(e))
+ bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (parm['patchname'], patchdir, repr(e)))
bb.utils.remove(process_tmpdir, True)
del os.environ['TMPDIR']
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index ccfe223289..49e166e697 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -1,4 +1,6 @@
-inherit meta image-postinst-intercepts image-artifact-names
+PACKAGES = ""
+
+inherit image-postinst-intercepts image-artifact-names
# Wildcards specifying complementary packages to install for every package that has been explicitly
# installed into the rootfs
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 35679208bc..9187f53f13 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -550,7 +550,7 @@ python copy_buildsystem () {
# We don't need sstate do_package files
for root, dirs, files in os.walk(sstate_out):
for name in files:
- if name.endswith("_package.tgz"):
+ if name.endswith("_package.tar.zst"):
f = os.path.join(root, name)
os.remove(f)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 77614ae860..1ec23c0923 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -129,4 +129,4 @@ def package_qa_check_missing_ptest(pn, d, messages):
enabled_ptests = " ".join([d.getVar('PTESTS_FAST'), d.getVar('PTESTS_SLOW'), d.getVar('PTESTS_PROBLEMS')]).split()
if (pn + "-ptest").replace(d.getVar('MLPREFIX'), '') not in enabled_ptests:
- package_qa_handle_error("missing-ptest", "supports ptests but is not included in oe-core's ptest-packagelists.inc", d)
+ oe.qa.handle_error("missing-ptest", "supports ptests but is not included in oe-core's ptest-packagelists.inc", d)
diff --git a/meta/classes/python3-dir.bbclass b/meta/classes/python3-dir.bbclass
index f51f971fc5..ff03e584d4 100644
--- a/meta/classes/python3-dir.bbclass
+++ b/meta/classes/python3-dir.bbclass
@@ -1,4 +1,4 @@
-PYTHON_BASEVERSION = "3.9"
+PYTHON_BASEVERSION = "3.10"
PYTHON_ABI = ""
PYTHON_DIR = "python${PYTHON_BASEVERSION}"
PYTHON_PN = "python3"
diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass
deleted file mode 100644
index 378121903d..0000000000
--- a/meta/classes/reproducible_build.bbclass
+++ /dev/null
@@ -1,127 +0,0 @@
-# reproducible_build.bbclass
-#
-# Sets SOURCE_DATE_EPOCH in each component's build environment.
-# Upstream components (generally) respect this environment variable,
-# using it in place of the "current" date and time.
-# See https://reproducible-builds.org/specs/source-date-epoch/
-#
-# After sources are unpacked but before they are patched, we set a reproducible value for SOURCE_DATE_EPOCH.
-# This value should be reproducible for anyone who builds the same revision from the same sources.
-#
-# There are 4 ways we determine SOURCE_DATE_EPOCH:
-#
-# 1. Use the value from __source_date_epoch.txt file if this file exists.
-# This file was most likely created in the previous build by one of the following methods 2,3,4.
-# Alternatively, it can be provided by a recipe via SRC_URI.
-#
-# If the file does not exist:
-#
-# 2. If there is a git checkout, use the last git commit timestamp.
-# Git does not preserve file timestamps on checkout.
-#
-# 3. Use the mtime of "known" files such as NEWS, CHANGLELOG, ...
-# This works for well-kept repositories distributed via tarball.
-#
-# 4. Use the modification time of the youngest file in the source tree, if there is one.
-# This will be the newest file from the distribution tarball, if any.
-#
-# 5. Fall back to a fixed timestamp.
-#
-# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE.
-# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task
-# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE.
-#
-# If this file is found by other tasks, the value is exported in the SOURCE_DATE_EPOCH variable.
-# SOURCE_DATE_EPOCH is set for all tasks that might use it (do_configure, do_compile, do_package, ...)
-
-BUILD_REPRODUCIBLE_BINARIES ??= '1'
-inherit ${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', 'reproducible_build_simple', '')}
-
-SDE_DIR = "${WORKDIR}/source-date-epoch"
-SDE_FILE = "${SDE_DIR}/__source_date_epoch.txt"
-SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch"
-
-# Enable compiler warning when the __TIME__, __DATE__ and __TIMESTAMP__ macros are used.
-TARGET_CC_ARCH:append:class-target = " -Wdate-time"
-
-# A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE
-export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
-
-SSTATETASKS += "do_deploy_source_date_epoch"
-
-do_deploy_source_date_epoch () {
- mkdir -p ${SDE_DEPLOYDIR}
- if [ -e ${SDE_FILE} ]; then
- echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}."
- cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt
- else
- echo "${SDE_FILE} not found!"
- fi
-}
-
-python do_deploy_source_date_epoch_setscene () {
- sstate_setscene(d)
- bb.utils.mkdirhier(d.getVar('SDE_DIR'))
- sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt')
- if os.path.exists(sde_file):
- target = d.getVar('SDE_FILE')
- bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target))
- bb.utils.rename(sde_file, target)
- else:
- bb.debug(1, "%s not found!" % sde_file)
-}
-
-do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}"
-do_deploy_source_date_epoch[sstate-plaindirs] = "${SDE_DEPLOYDIR}"
-addtask do_deploy_source_date_epoch_setscene
-addtask do_deploy_source_date_epoch before do_configure after do_patch
-
-python create_source_date_epoch_stamp() {
- import oe.reproducible
-
- epochfile = d.getVar('SDE_FILE')
- tmp_file = "%s.new" % epochfile
-
- source_date_epoch = oe.reproducible.get_source_date_epoch(d, d.getVar('S'))
-
- bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
- bb.utils.mkdirhier(d.getVar('SDE_DIR'))
- with open(tmp_file, 'w') as f:
- f.write(str(source_date_epoch))
-
- os.rename(tmp_file, epochfile)
-}
-
-def get_source_date_epoch_value(d):
- cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH')
- if cached:
- return cached
-
- epochfile = d.getVar('SDE_FILE')
- source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
- try:
- with open(epochfile, 'r') as f:
- s = f.read()
- try:
- source_date_epoch = int(s)
- # workaround for old sstate with SDE_FILE content being 0 - use SOURCE_DATE_EPOCH_FALLBACK
- if source_date_epoch == 0 :
- source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
- bb.warn("SOURCE_DATE_EPOCH value from sstate '%s' is deprecated/invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK '%s'" % (s, source_date_epoch))
- except ValueError:
- bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s)
- source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
- bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
- except FileNotFoundError:
- bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch))
-
- d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch))
- return str(source_date_epoch)
-
-export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}"
-BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH"
-
-python () {
- if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1':
- d.appendVarFlag("do_unpack", "postfuncs", " create_source_date_epoch_stamp")
-}
diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass
deleted file mode 100644
index 393372993d..0000000000
--- a/meta/classes/reproducible_build_simple.bbclass
+++ /dev/null
@@ -1,9 +0,0 @@
-# Setup default environment for reproducible builds.
-
-BUILD_REPRODUCIBLE_BINARIES = "1"
-
-export PYTHONHASHSEED = "0"
-export PERL_HASH_SEED = "0"
-export SOURCE_DATE_EPOCH ??= "1520598896"
-
-REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896"
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 07901d7597..5f12d5aaeb 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -73,7 +73,7 @@ do_rm_work () {
# sstate version since otherwise we'd need to leave 'plaindirs' around
# such as 'packages' and 'packages-split' and these can be large. No end
# of chain tasks depend directly on do_package anymore.
- rm -f $i;
+ rm -f -- $i;
;;
*_setscene*)
# Skip stamps which are already setscene versions
@@ -90,7 +90,7 @@ do_rm_work () {
;;
esac
done
- rm -f $i
+ rm -f -- $i
esac
done
@@ -100,9 +100,9 @@ do_rm_work () {
# Retain only logs and other files in temp, safely ignore
# failures of removing pseudo folers on NFS2/3 server.
if [ $dir = 'pseudo' ]; then
- rm -rf $dir 2> /dev/null || true
+ rm -rf -- $dir 2> /dev/null || true
elif ! echo "$excludes" | grep -q -w "$dir"; then
- rm -rf $dir
+ rm -rf -- $dir
fi
done
}
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index c5746eba13..7fe9e3d8c8 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -218,8 +218,8 @@ postinst_enable_logging () {
# Modify systemd default target
#
set_systemd_default_target () {
- if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e ${IMAGE_ROOTFS}${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ]; then
- ln -sf ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
+ if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e ${IMAGE_ROOTFS}${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} ]; then
+ ln -sf ${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
fi
}
diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index a8803d61b6..98d65970e8 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -1,3 +1,5 @@
+inherit python3native
+
# Common variables used by all Rust builds
export rustlibdir = "${libdir}/rust"
FILES:${PN} += "${rustlibdir}/*.so"
@@ -133,8 +135,12 @@ create_wrapper () {
shift
cat <<- EOF > "${file}"
- #!/bin/sh
- exec $@ "\$@"
+ #!/usr/bin/env python3
+ import os, sys
+ orig_binary = "$@"
+ binary = orig_binary.split()[0]
+ args = orig_binary.split() + sys.argv[1:]
+ os.execvp(binary, args)
EOF
chmod +x "${file}"
}
@@ -169,12 +175,7 @@ do_rust_create_wrappers () {
# Yocto Target / Rust Target archiver
create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}"
- # Need to filter out LD_LIBRARY_PATH from the linker without using shell
- mv ${RUST_BUILD_CCLD} ${RUST_BUILD_CCLD}.real
- ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_BUILD_CCLD}
- mv ${RUST_TARGET_CCLD} ${RUST_TARGET_CCLD}.real
- ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_TARGET_CCLD}
}
-addtask rust_create_wrappers before do_configure after do_patch
+addtask rust_create_wrappers before do_configure after do_patch do_prepare_recipe_sysroot
do_rust_create_wrappers[dirs] += "${WRAPPER_DIR}"
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 0bd1f36805..c5f4dfda41 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -176,17 +176,39 @@ python () {
bb.fatal("Please add your architecture to siteinfo.bbclass")
}
-def siteinfo_get_files(d, sysrootcache = False):
+# Layers with siteconfig need to add a replacement path to this variable so the
+# sstate isn't path specific
+SITEINFO_PATHVARS = "COREBASE"
+
+def siteinfo_get_files(d, sysrootcache=False):
sitedata = siteinfo_data(d)
- sitefiles = ""
+ sitefiles = []
+ searched = []
for path in d.getVar("BBPATH").split(":"):
for element in sitedata:
filename = os.path.join(path, "site", element)
if os.path.exists(filename):
- sitefiles += filename + " "
+ searched.append(filename + ":True")
+ sitefiles.append(filename)
+ else:
+ searched.append(filename + ":False")
+
+ # Have to parameterise out hardcoded paths such as COREBASE for the main site files
+ for var in d.getVar("SITEINFO_PATHVARS").split():
+ searched2 = []
+ replace = os.path.normpath(d.getVar(var))
+ for s in searched:
+ searched2.append(s.replace(replace, "${" + var + "}"))
+ searched = searched2
+
+ if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d):
+ # We need sstate sigs for native/cross not to vary upon arch so we can't depend on the site files.
+ # In future we may want to depend upon all site files?
+ # This would show up as breaking sstatetests.SStateTests.test_sstate_32_64_same_hash for example
+ searched = []
if not sysrootcache:
- return sitefiles
+ return sitefiles, searched
# Now check for siteconfig cache files in sysroots
path_siteconfig = d.getVar('SITECONFIG_SYSROOTCACHE')
@@ -195,8 +217,8 @@ def siteinfo_get_files(d, sysrootcache = False):
if not i.endswith("_config"):
continue
filename = os.path.join(path_siteconfig, i)
- sitefiles += filename + " "
- return sitefiles
+ sitefiles.append(filename)
+ return sitefiles, searched
#
# Make some information available via variables
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d7f1b3f26e..3c179259e7 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1,4 +1,6 @@
-SSTATE_VERSION = "3"
+SSTATE_VERSION = "7"
+
+SSTATE_ZSTD_CLEVEL ??= "8"
SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control"
SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-${PN}"
@@ -6,12 +8,12 @@ SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-${PN}"
def generate_sstatefn(spec, hash, taskname, siginfo, d):
if taskname is None:
return ""
- extension = ".tgz"
+ extension = ".tar.zst"
# 8 chars reserved for siginfo
limit = 254 - 8
if siginfo:
limit = 254
- extension = ".tgz.siginfo"
+ extension = ".tar.zst.siginfo"
if not hash:
hash = "INVALID"
fn = spec + hash + "_" + taskname + extension
@@ -37,7 +39,7 @@ SSTATE_PKGNAME = "${SSTATE_EXTRAPATH}${@generate_sstatefn(d.getVar('SSTATE_PK
SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
SSTATE_EXTRAPATH = ""
SSTATE_EXTRAPATHWILDCARD = ""
-SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/*/${SSTATE_PKGSPEC}*_${SSTATE_PATH_CURRTASK}.tgz*"
+SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/*/${SSTATE_PKGSPEC}*_${SSTATE_PATH_CURRTASK}.tar.zst*"
# explicitly make PV to depend on evaluated value of PV variable
PV[vardepvalue] = "${PV}"
@@ -67,6 +69,13 @@ SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/microcode"
SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*"
SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f'
SSTATE_SCAN_CMD_NATIVE ??= 'grep -Irl -e ${RECIPE_SYSROOT} -e ${RECIPE_SYSROOT_NATIVE} -e ${HOSTTOOLS_DIR} ${SSTATE_BUILDDIR}'
+SSTATE_HASHEQUIV_FILEMAP ?= " \
+ populate_sysroot:*/postinst-useradd-*:${TMPDIR} \
+ populate_sysroot:*/postinst-useradd-*:${COREBASE} \
+ populate_sysroot:*/postinst-useradd-*:regex-\s(PATH|PSEUDO_IGNORE_PATHS|HOME|LOGNAME|OMP_NUM_THREADS|USER)=.*\s \
+ populate_sysroot:*/crossscripts/*:${TMPDIR} \
+ populate_sysroot:*/crossscripts/*:${COREBASE} \
+ "
BB_HASHFILENAME = "False ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}"
@@ -107,6 +116,9 @@ SSTATE_SIG_KEY ?= ""
SSTATE_SIG_PASSPHRASE ?= ""
# Whether to verify the GnUPG signatures when extracting sstate archives
SSTATE_VERIFY_SIG ?= "0"
+# List of signatures to consider valid.
+SSTATE_VALID_SIGS ??= ""
+SSTATE_VALID_SIGS[vardepvalue] = ""
SSTATE_HASHEQUIV_METHOD ?= "oe.sstatesig.OEOuthashBasic"
SSTATE_HASHEQUIV_METHOD[doc] = "The fully-qualified function used to calculate \
@@ -363,7 +375,7 @@ def sstate_installpkg(ss, d):
bb.warn("No signature file for sstate package %s, skipping acceleration..." % sstatepkg)
return False
signer = get_signer(d, 'local')
- if not signer.verify(sstatepkg + '.sig'):
+ if not signer.verify(sstatepkg + '.sig', d.getVar("SSTATE_VALID_SIGS")):
bb.warn("Cannot verify signature on sstate package %s, skipping acceleration..." % sstatepkg)
return False
@@ -640,10 +652,21 @@ python sstate_hardcode_path () {
def sstate_package(ss, d):
import oe.path
+ import time
tmpdir = d.getVar('TMPDIR')
+ fixtime = False
+ if ss['task'] == "package":
+ fixtime = True
+
+ def fixtimestamp(root, path):
+ f = os.path.join(root, path)
+ if os.lstat(f).st_mtime > sde:
+ os.utime(f, (sde, sde), follow_symlinks=False)
+
sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
+ sde = int(d.getVar("SOURCE_DATE_EPOCH") or time.time())
d.setVar("SSTATE_CURRTASK", ss['task'])
bb.utils.remove(sstatebuild, recurse=True)
bb.utils.mkdirhier(sstatebuild)
@@ -656,6 +679,8 @@ def sstate_package(ss, d):
# to sstate tasks but there aren't many of these so better just avoid them entirely.
for walkroot, dirs, files in os.walk(state[1]):
for file in files + dirs:
+ if fixtime:
+ fixtimestamp(walkroot, file)
srcpath = os.path.join(walkroot, file)
if not os.path.islink(srcpath):
continue
@@ -677,6 +702,11 @@ def sstate_package(ss, d):
bb.utils.mkdirhier(plain)
bb.utils.mkdirhier(pdir)
bb.utils.rename(plain, pdir)
+ if fixtime:
+ fixtimestamp(pdir, "")
+ for walkroot, dirs, files in os.walk(pdir):
+ for file in files + dirs:
+ fixtimestamp(walkroot, file)
d.setVar('SSTATE_BUILDDIR', sstatebuild)
d.setVar('SSTATE_INSTDIR', sstatebuild)
@@ -731,6 +761,7 @@ def pstaging_fetch(sstatefetch, d):
localdata.setVar('FILESPATH', dldir)
localdata.setVar('DL_DIR', dldir)
localdata.setVar('PREMIRRORS', mirrors)
+ localdata.setVar('SRCPV', d.getVar('SRCPV'))
# if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK,
# we'll want to allow network access for the current set of fetches.
@@ -755,6 +786,9 @@ def pstaging_fetch(sstatefetch, d):
except bb.fetch2.BBFetchException:
pass
+pstaging_fetch[vardepsexclude] += "SRCPV"
+
+
def sstate_setscene(d):
shared_state = sstate_state_fromvars(d)
accelerate = sstate_installpkg(shared_state, d)
@@ -803,23 +837,24 @@ sstate_create_package () {
mkdir --mode=0775 -p `dirname ${SSTATE_PKG}`
TFILE=`mktemp ${SSTATE_PKG}.XXXXXXXX`
- # Use pigz if available
- OPT="-czS"
- if [ -x "$(command -v pigz)" ]; then
- OPT="-I pigz -cS"
+ OPT="-cS"
+ ZSTD="zstd -${SSTATE_ZSTD_CLEVEL} -T${ZSTD_THREADS}"
+ # Use pzstd if available
+ if [ -x "$(command -v pzstd)" ]; then
+ ZSTD="pzstd -${SSTATE_ZSTD_CLEVEL} -p ${ZSTD_THREADS}"
fi
# Need to handle empty directories
if [ "$(ls -A)" ]; then
set +e
- tar $OPT -f $TFILE *
+ tar -I "$ZSTD" $OPT -f $TFILE *
ret=$?
if [ $ret -ne 0 ] && [ $ret -ne 1 ]; then
exit 1
fi
set -e
else
- tar $OPT --file=$TFILE --files-from=/dev/null
+ tar -I "$ZSTD" $OPT --file=$TFILE --files-from=/dev/null
fi
chmod 0664 $TFILE
# Skip if it was already created by some other process
@@ -858,7 +893,13 @@ python sstate_report_unihash() {
# Will be run from within SSTATE_INSTDIR.
#
sstate_unpack_package () {
- tar -xvzf ${SSTATE_PKG}
+ ZSTD="zstd -T${ZSTD_THREADS}"
+ # Use pzstd if available
+ if [ -x "$(command -v pzstd)" ]; then
+ ZSTD="pzstd -p ${ZSTD_THREADS}"
+ fi
+
+ tar -I "$ZSTD" -xvf ${SSTATE_PKG}
# update .siginfo atime on local/NFS mirror
[ -O ${SSTATE_PKG}.siginfo ] && [ -w ${SSTATE_PKG}.siginfo ] && [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo
# Use "! -w ||" to return true for read only files
@@ -954,10 +995,11 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True,
foundNet.add(tid)
if tid in missed:
missed.remove(tid)
- except:
+ except bb.fetch2.FetchError as e:
missed.add(tid)
- bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri)
- pass
+ bb.debug(2, "SState: Unsuccessful fetch test for %s (%s)" % (srcuri, e))
+ except Exception as e:
+ bb.error("SState: cannot test %s: %s" % (srcuri, e))
if len(tasklist) >= min_tasks:
bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d)
@@ -1037,15 +1079,13 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
logit("Considering setscene task: %s" % (str(taskdependees[task])), log)
+ directtasks = ["do_populate_lic", "do_deploy_source_date_epoch", "do_shared_workdir", "do_stash_locale", "do_gcc_stash_builddir"]
+
def isNativeCross(x):
return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x or x.endswith("-cross")
- # We only need to trigger populate_lic through direct dependencies
- if taskdependees[task][1] == "do_populate_lic":
- return True
-
- # stash_locale and gcc_stash_builddir are never needed as a dependency for built objects
- if taskdependees[task][1] == "do_stash_locale" or taskdependees[task][1] == "do_gcc_stash_builddir":
+ # We only need to trigger deploy_source_date_epoch through direct dependencies
+ if taskdependees[task][1] in directtasks:
return True
# We only need to trigger packagedata through direct dependencies
@@ -1068,8 +1108,8 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
# do_package_write_* need do_populate_sysroot as they're mainly postinstall dependencies
if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
return False
- # do_package/packagedata/package_qa don't need do_populate_sysroot
- if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa']:
+ # do_package/packagedata/package_qa/deploy don't need do_populate_sysroot
+ if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa', 'do_deploy']:
continue
# Native/Cross packages don't exist and are noexec anyway
if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package', 'do_package_qa']:
@@ -1117,13 +1157,9 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
# Target populate_sysroot need their dependencies
return False
- if taskdependees[task][1] == 'do_shared_workdir':
+ if taskdependees[dep][1] in directtasks:
continue
- if taskdependees[dep][1] == "do_populate_lic":
- continue
-
-
# Safe fallthrough default
logit(" Default setscene dependency fall through due to dependency: %s" % (str(taskdependees[dep])), log)
return False
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index af3397bab6..65a6cd5120 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -306,6 +306,7 @@ python extend_recipe_sysroot() {
sstatetasks = d.getVar("SSTATETASKS").split()
# Add recipe specific tasks referenced by setscene_depvalid()
sstatetasks.append("do_stash_locale")
+ sstatetasks.append("do_deploy")
def print_dep_tree(deptree):
data = ""
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 3c689aec91..4db05a4af4 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -64,8 +64,6 @@ BASICTESTSUITE = "\
DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
-# aarch64 has no graphics
-DEFAULT_TEST_SUITES:remove:aarch64 = "xorg"
# musl doesn't support systemtap
DEFAULT_TEST_SUITES:remove:libc-musl = "stap"
@@ -201,6 +199,7 @@ def testimage_main(d):
import json
import signal
import logging
+ import shutil
from bb.utils import export_proxies
from oeqa.core.utils.misc import updateTestData
@@ -236,9 +235,10 @@ def testimage_main(d):
tdname = "%s.testdata.json" % image_name
try:
- td = json.load(open(tdname, "r"))
- except (FileNotFoundError) as err:
- bb.fatal('File %s Not Found. Have you built the image with INHERIT+="testimage" in the conf/local.conf?' % tdname)
+ with open(tdname, "r") as f:
+ td = json.load(f)
+ except FileNotFoundError as err:
+ bb.fatal('File %s not found (%s).\nHave you built the image with INHERIT += "testimage" in the conf/local.conf?' % (tdname, err))
# Some variables need to be updates (mostly paths) with the
# ones of the current environment because some tests require them.
@@ -408,10 +408,17 @@ def testimage_main(d):
get_testimage_result_id(configuration),
dump_streams=d.getVar('TESTREPORT_FULLLOGS'))
results.logSummary(pn)
+
+ # Copy additional logs to tmp/log/oeqa so it's easier to find them
+ targetdir = os.path.join(get_testimage_json_result_dir(d), d.getVar("PN"))
+ os.makedirs(targetdir, exist_ok=True)
+ os.symlink(bootlog, os.path.join(targetdir, os.path.basename(bootlog)))
+ os.symlink(d.getVar("BB_LOGFILE"), os.path.join(targetdir, os.path.basename(d.getVar("BB_LOGFILE") + "." + d.getVar('DATETIME'))))
+
if not results or not complete:
- bb.fatal('%s - FAILED - tests were interrupted during execution' % pn, forcelog=True)
+ bb.fatal('%s - FAILED - tests were interrupted during execution, check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True)
if not results.wasSuccessful():
- bb.fatal('%s - FAILED - check the task log and the ssh log' % pn, forcelog=True)
+ bb.fatal('%s - FAILED - also check the logs in %s' % (pn, d.getVar("LOG_DIR")), forcelog=True)
def get_runtime_paths(d):
"""
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 479f3b706e..fb6261c91d 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -65,6 +65,7 @@ toolchain_create_sdk_env_script () {
# This function creates an environment-setup-script in the TMPDIR which enables
# a OE-core IDE to integrate with the build tree
+# Caller must ensure CONFIG_SITE is setup
toolchain_create_tree_env_script () {
script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
rm -f $script
@@ -73,7 +74,7 @@ toolchain_create_tree_env_script () {
echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script
echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script
echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script
- echo 'export CONFIG_SITE="${@siteinfo_get_files(d)}"' >> $script
+ echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script
echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script
echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
@@ -161,7 +162,7 @@ EOF
}
#we get the cached site config in the runtime
-TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}"
+TOOLCHAIN_CONFIGSITE_NOCACHE = "${@' '.join(siteinfo_get_files(d)[0])}"
TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"
DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}"
diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index 07a303d0a0..b9ad35821a 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -53,6 +53,8 @@ SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}${SPL_DELIMITER}${SPL_SUFFIX}"
# include it in the SRC_URI and set the UBOOT_ENV parameter.
UBOOT_ENV_SUFFIX ?= "txt"
UBOOT_ENV ?= ""
+UBOOT_ENV_SRC_SUFFIX ?= "cmd"
+UBOOT_ENV_SRC ?= "${UBOOT_ENV}.${UBOOT_ENV_SRC_SUFFIX}"
UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"
UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"
UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index fdf153248c..bae8cada0a 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -162,8 +162,8 @@ concat_dtb() {
mkdir -p ${DEPLOYDIR}
if [ -n "${UBOOT_CONFIG}" ]; then
for config in ${UBOOT_MACHINE}; do
- CONFIG_B_PATH="${config}"
- cd ${B}/${config}
+ CONFIG_B_PATH="$config"
+ cd ${B}/$config
concat_dtb_helper
done
else
@@ -179,8 +179,8 @@ concat_spl_dtb() {
mkdir -p ${DEPLOYDIR}
if [ -n "${UBOOT_CONFIG}" ]; then
for config in ${UBOOT_MACHINE}; do
- CONFIG_B_PATH="${config}"
- cd ${B}/${config}
+ CONFIG_B_PATH="$config"
+ cd ${B}/$config
concat_spl_dtb_helper
done
else
@@ -231,7 +231,7 @@ do_install:append() {
if [ "${PN}" = "${UBOOT_PN}" ]; then
if [ -n "${UBOOT_CONFIG}" ]; then
for config in ${UBOOT_MACHINE}; do
- cd ${B}/${config}
+ cd ${B}/$config
if [ "${UBOOT_SIGN_ENABLE}" = "1" -o "${UBOOT_FITIMAGE_ENABLE}" = "1" ] && \
[ -n "${UBOOT_DTB_BINARY}" ]; then
install_helper
@@ -286,19 +286,19 @@ addtask uboot_generate_rsa_keys before do_uboot_assemble_fitimage after do_compi
# Create a ITS file for the U-boot FIT, for use when
# we want to sign it so that the SPL can verify it
uboot_fitimage_assemble() {
- uboot_its="${1}"
- uboot_nodtb_bin="${2}"
- uboot_dtb="${3}"
- uboot_bin="${4}"
- spl_dtb="${5}"
+ uboot_its="$1"
+ uboot_nodtb_bin="$2"
+ uboot_dtb="$3"
+ uboot_bin="$4"
+ spl_dtb="$5"
uboot_csum="${UBOOT_FIT_HASH_ALG}"
uboot_sign_algo="${UBOOT_FIT_SIGN_ALG}"
uboot_sign_keyname="${SPL_SIGN_KEYNAME}"
- rm -f ${uboot_its} ${uboot_bin}
+ rm -f $uboot_its $uboot_bin
# First we create the ITS script
- cat << EOF >> ${uboot_its}
+ cat << EOF >> $uboot_its
/dts-v1/;
/ {
@@ -308,7 +308,7 @@ uboot_fitimage_assemble() {
images {
uboot {
description = "U-Boot image";
- data = /incbin/("${uboot_nodtb_bin}");
+ data = /incbin/("$uboot_nodtb_bin");
type = "standalone";
os = "u-boot";
arch = "${UBOOT_ARCH}";
@@ -318,34 +318,34 @@ uboot_fitimage_assemble() {
EOF
if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then
- cat << EOF >> ${uboot_its}
+ cat << EOF >> $uboot_its
signature {
- algo = "${uboot_csum},${uboot_sign_algo}";
- key-name-hint = "${uboot_sign_keyname}";
+ algo = "$uboot_csum,$uboot_sign_algo";
+ key-name-hint = "$uboot_sign_keyname";
};
EOF
fi
- cat << EOF >> ${uboot_its}
+ cat << EOF >> $uboot_its
};
fdt {
description = "U-Boot FDT";
- data = /incbin/("${uboot_dtb}");
+ data = /incbin/("$uboot_dtb");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
EOF
if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then
- cat << EOF >> ${uboot_its}
+ cat << EOF >> $uboot_its
signature {
- algo = "${uboot_csum},${uboot_sign_algo}";
- key-name-hint = "${uboot_sign_keyname}";
+ algo = "$uboot_csum,$uboot_sign_algo";
+ key-name-hint = "$uboot_sign_keyname";
};
EOF
fi
- cat << EOF >> ${uboot_its}
+ cat << EOF >> $uboot_its
};
};
@@ -365,8 +365,8 @@ EOF
#
${UBOOT_MKIMAGE} \
${@'-D "${SPL_MKIMAGE_DTCOPTS}"' if len('${SPL_MKIMAGE_DTCOPTS}') else ''} \
- -f ${uboot_its} \
- ${uboot_bin}
+ -f $uboot_its \
+ $uboot_bin
if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then
#
@@ -375,8 +375,8 @@ EOF
${UBOOT_MKIMAGE_SIGN} \
${@'-D "${SPL_MKIMAGE_DTCOPTS}"' if len('${SPL_MKIMAGE_DTCOPTS}') else ''} \
-F -k "${SPL_SIGN_KEYDIR}" \
- -K "${spl_dtb}" \
- -r ${uboot_bin} \
+ -K "$spl_dtb" \
+ -r $uboot_bin \
${SPL_MKIMAGE_SIGN_ARGS}
fi
@@ -408,8 +408,8 @@ do_uboot_assemble_fitimage() {
kernel_uboot_fitimage_name=`basename ${STAGING_DATADIR}/u-boot-fitImage-*`
kernel_uboot_its_name=`basename ${STAGING_DATADIR}/u-boot-its-*`
cd ${B}
- uboot_fitimage_assemble ${kernel_uboot_its_name} ${UBOOT_NODTB_BINARY} \
- ${UBOOT_DTB_BINARY} ${kernel_uboot_fitimage_name} \
+ uboot_fitimage_assemble $kernel_uboot_its_name ${UBOOT_NODTB_BINARY} \
+ ${UBOOT_DTB_BINARY} $kernel_uboot_fitimage_name \
${SPL_DTB_BINARY}
fi
}
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 287ef84334..20771a0ce5 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -230,6 +230,10 @@ fakeroot python populate_packages:prepend () {
preinst += 'perform_useradd () {\n%s}\n' % d.getVar('perform_useradd')
preinst += 'perform_groupmems () {\n%s}\n' % d.getVar('perform_groupmems')
preinst += d.getVar('useradd_preinst')
+ # Expand out the *_PARAM variables to the package specific versions
+ for rep in ["GROUPADD_PARAM", "USERADD_PARAM", "GROUPMEMS_PARAM"]:
+ val = d.getVar(rep + ":" + pkg) or ""
+ preinst = preinst.replace("${" + rep + "}", val)
d.setVar('pkg_preinst:%s' % pkg, preinst)
# RDEPENDS setup
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 072ea1f63c..b4eb3d38ab 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -30,7 +30,6 @@ oe_libinstall() {
silent=""
require_static=""
require_shared=""
- staging_install=""
while [ "$#" -gt 0 ]; do
case "$1" in
-C)
@@ -62,10 +61,6 @@ oe_libinstall() {
if [ -z "$destpath" ]; then
bbfatal "oe_libinstall: no destination path specified"
fi
- if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null
- then
- staging_install=1
- fi
__runcmd () {
if [ -z "$silent" ]; then
@@ -159,36 +154,6 @@ oe_libinstall() {
__runcmd cd "$olddir"
}
-oe_machinstall() {
- # Purpose: Install machine dependent files, if available
- # If not available, check if there is a default
- # If no default, just touch the destination
- # Example:
- # $1 $2 $3 $4
- # oe_machinstall -m 0644 fstab ${D}/etc/fstab
- #
- # TODO: Check argument number?
- #
- filename=`basename $3`
- dirname=`dirname $3`
-
- for o in `echo ${OVERRIDES} | tr ':' ' '`; do
- if [ -e $dirname/$o/$filename ]; then
- bbnote $dirname/$o/$filename present, installing to $4
- install $1 $2 $dirname/$o/$filename $4
- return
- fi
- done
-# bbnote overrides specific file NOT present, trying default=$3...
- if [ -e $3 ]; then
- bbnote $3 present, installing to $4
- install $1 $2 $3 $4
- else
- bbnote $3 NOT present, touching empty $4
- touch $4
- fi
-}
-
create_cmdline_wrapper () {
# Create a wrapper script where commandline options are needed
#
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 35faef9a36..f406f927b0 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "14"
# a reset of the equivalence, for example when reproducibility issues break the
# existing match data. Distros can also append to this value for the same effect.
#
-HASHEQUIV_HASH_VERSION = "5"
+HASHEQUIV_HASH_VERSION = "10"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2140d498f7..790f2f7a8c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -415,6 +415,7 @@ DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
+PKGDATA_DIR_SDK = "${TMPDIR}/pkgdata/${SDK_SYS}"
##################################################################
# SDK variables.
@@ -498,7 +499,7 @@ HOSTTOOLS += " \
HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}"
# Link to these if present
-HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo"
+HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo"
# Temporary add few more detected in bitbake world
HOSTTOOLS_NONFATAL += "join nl size yes zcat"
@@ -604,6 +605,7 @@ LINKER_HASH_STYLE:mipsarch:libc-musl = "sysv"
# Pass parallel make options to the compile task
EXTRA_OEMAKE:prepend:task-compile = "${PARALLEL_MAKE} "
PARALLEL_MAKEINST ??= "${PARALLEL_MAKE}"
+PARALLEL_MAKEINST[vardepvalue] = "1"
# Pass parallel make options to the install task
EXTRA_OEMAKE:prepend:task-install = "${PARALLEL_MAKEINST} "
@@ -627,6 +629,21 @@ BUILD_OPTIMIZATION = "${@oe.utils.vartrue('DEBUG_BUILD', '-Og -g -feliminate-unu
BUILD_OPTIMIZATION[vardeps] += "DEBUG_BUILD"
##################################################################
+# Reproducibility
+##################################################################
+
+SDE_DIR = "${WORKDIR}/source-date-epoch"
+SDE_FILE = "${SDE_DIR}/__source_date_epoch.txt"
+SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch"
+
+export PYTHONHASHSEED = "0"
+export PERL_HASH_SEED = "0"
+export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}"
+# A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE
+export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
+REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896"
+
+##################################################################
# Settings used by bitbake-layers.
##################################################################
BBLAYERS_LAYERINDEX_URL ??= "https://layers.openembedded.org/layerindex/"
@@ -811,9 +828,14 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
# Default parallelism and resource usage for xz
XZ_MEMLIMIT ?= "50%"
XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
+XZ_THREADS[vardepvalue] = "1"
XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}"
XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS"
+# Default parallelism for zstd
+ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
+ZSTD_THREADS[vardepvalue] = "1"
+
# Limit the number of threads that OpenMP libraries will use. Otherwise they
# may fallback to using all CPUs
export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}"
@@ -900,8 +922,9 @@ BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI
BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \
SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \
SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES \
- OMP_NUM_THREADS"
-BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR SSTATE_DIR "
+ OMP_NUM_THREADS BB_CURRENTTASK"
+BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR \
+ SSTATE_DIR SOURCE_DATE_EPOCH"
BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \
SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 5035508b98..f91df632d5 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -33,10 +33,8 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0"
NO32LIBS ??= "1"
-# Default logger already emits logfiles if a build fails, setting this to any non-empty value would just include more copies (prefixed with "|") in the output
-# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14542
-BBINCLUDELOGS ??= ""
-
+# Default to emitting logfiles if a build fails.
+BBINCLUDELOGS ??= "yes"
SDK_VERSION ??= "nodistro.0"
DISTRO_VERSION ??= "nodistro.0"
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 5e6fd8a267..a88b65a74c 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -1,5 +1,3 @@
#
# Default preferred versions
#
-
-PREFERRED_VERSION_adwaita-icon-theme ?= "3.34.3"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 0e8185f4e3..8f0b8d39b5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -4,7 +4,7 @@
#
# Please submit any patches against recipes in meta to the
# OE-Core mail list (openembedded-core@lists.openembedded.org)
-# For recipes in meta-yocto please use the Poky list (poky@yoctoproject.org)
+# For recipes in meta-yocto please use the Poky list (poky@lists.yoctoproject.org)
#
# If you have problems with or questions about a particular recipe, feel
# free to contact the maintainer directly (cc:ing the appropriate mailing list
@@ -46,7 +46,6 @@ RECIPE_MAINTAINER:pn-apt = "Aníbal Limón <limon.anibal@gmail.com>"
RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-assimp = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-at = "Chen Qi <Qi.Chen@windriver.com>"
RECIPE_MAINTAINER:pn-at-spi2-atk = "Tim Orling <timothy.t.orling@intel.com>"
RECIPE_MAINTAINER:pn-at-spi2-core = "Tim Orling <timothy.t.orling@intel.com>"
@@ -385,6 +384,7 @@ RECIPE_MAINTAINER:pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-libsm = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-libsoup = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libssh2 = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libssp-nonshared = "Khem Raj <raj.khem@gmail.com>"
@@ -467,6 +467,7 @@ RECIPE_MAINTAINER:pn-ltp = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER:pn-lttng-modules = "Richard Purdie <richard.purdie@linuxfoundation.org>"
RECIPE_MAINTAINER:pn-lttng-tools = "Richard Purdie <richard.purdie@linuxfoundation.org>"
RECIPE_MAINTAINER:pn-lttng-ust = "Richard Purdie <richard.purdie@linuxfoundation.org>"
+RECIPE_MAINTAINER:pn-lua = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-lz4 = "Denys Dmytriyenko <denis@denix.org>"
RECIPE_MAINTAINER:pn-lzo = "Denys Dmytriyenko <denis@denix.org>"
RECIPE_MAINTAINER:pn-lzip = "Denys Dmytriyenko <denis@denix.org>"
@@ -535,6 +536,7 @@ RECIPE_MAINTAINER:pn-netbase = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-nettle = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-nfs-export-root = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER:pn-nfs-utils = "Robert Yang <liezhi.yang@windriver.com>"
+RECIPE_MAINTAINER:pn-nghttp2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-ninja = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -635,6 +637,7 @@ RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <timothy.t.orling@in
RECIPE_MAINTAINER:pn-python3-subunit = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER:pn-python3-testtools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <timothy.t.orling@intel.com>"
+RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <timothy.t.orling@intel.com>"
RECIPE_MAINTAINER:pn-python3-typogrify = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-python3-wcwidth = "Tim Orling <timothy.t.orling@intel.com>"
RECIPE_MAINTAINER:pn-python3-zipp = "Tim Orling <timothy.t.orling@intel.com>"
@@ -660,7 +663,7 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <Randy.MacLeod@windriver.com>"
RECIPE_MAINTAINER:pn-rustfmt = "Randy MacLeod <Randy.MacLeod@windriver.com>"
-RECIPE_MAINTAINER:pn-rust-cross-${TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>"
+RECIPE_MAINTAINER:pn-rust-cross-${TARGET_ARCH}-${TCLIBC} = "Randy MacLeod <Randy.MacLeod@windriver.com>"
RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>"
RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod <Randy.MacLeod@windriver.com>"
RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index e0ae1dd971..2e324f8da4 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -40,6 +40,7 @@ PTESTS_FAST = "\
libxml-sax-base-perl-ptest \
libxml-simple-perl-ptest \
libxml2-ptest \
+ lua-ptest \
lzo-ptest \
m4-ptest \
nettle-ptest \
@@ -71,6 +72,7 @@ PTESTS_SLOW = "\
coreutils-ptest \
dbus-test-ptest \
e2fsprogs-ptest \
+ findutils-ptest \
glib-2.0-ptest \
gstreamer1.0-ptest \
libevent-ptest \
diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc
deleted file mode 100644
index a11ba22a8f..0000000000
--- a/meta/conf/distro/include/rust_versions.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# include this in your distribution to easily switch between versions
-# just by changing RUST_VERSION variable
-
-RUST_VERSION ?= "1.51.0"
-
-PREFERRED_VERSION_cargo ?= "${RUST_VERSION}"
-PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}"
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 47f23f5c39..168bda2fd1 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,12 +21,13 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.37%"
GDBVERSION ?= "10.%"
GLIBCVERSION ?= "2.34"
-LINUXLIBCVERSION ?= "5.13%"
-QEMUVERSION ?= "6.0%"
+LINUXLIBCVERSION ?= "5.14%"
+QEMUVERSION ?= "6.1%"
GOVERSION ?= "1.16%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
LLVMVERSION ?= "12.0.1"
+RUSTVERSION ?= "1.55.0"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
@@ -81,3 +82,15 @@ PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}"
PREFERRED_VERSION_llvm = "${LLVMVERSION}"
PREFERRED_VERSION_llvm-native = "${LLVMVERSION}"
PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
+
+# Rust toolchain preferred versions:
+
+PREFERRED_VERSION_cargo ?= "${RUSTVERSION}"
+PREFERRED_VERSION_cargo-native ?= "${RUSTVERSION}"
+PREFERRED_VERSION_libstd-rs ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-llvm ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-llvm-native ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-native ?= "${RUSTVERSION}"
+
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index f4697e28d0..80ad8e10d5 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -17,7 +17,7 @@ do_compile_ptest_base[doc] = "Compiles the runtime test suite included in the so
do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built"
do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built"
do_deploy[doc] = "Writes deployable output files to the deploy directory"
-do_devpyshell[doc] = "Starts an interactive Python shell for development/debugging"
+do_pydevshell[doc] = "Starts an interactive Python shell for development/debugging"
do_devshell[doc] = "Starts a shell with the environment set up for development/debugging"
do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel"
do_fetch[doc] = "Fetches the source code"
@@ -88,7 +88,7 @@ BBFILE_COLLECTIONS[doc] = "Lists the names of configured layers. These names are
BBFILE_PATTERN[doc] = "Variable that expands to match files from BBFILES in a particular layer. This variable is used in the layer.conf file and must be suffixed with the name of a layer."
BBFILE_PRIORITY[doc] = "Assigns the priority for recipe files in each layer. Setting this variable allows you to prioritize a layer against other layers that contain the same recipe."
BBFILES[doc] = "List of recipe files used by BitBake to build software."
-BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure. Set to empty if you don't want to have 2nd copy of failed task output (prefixed with '|') in the cooker log."
+BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure."
BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file."
BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files."
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 307ad7e223..b3cc8a249e 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -48,6 +48,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
+ *->patch-native \
*->quilt-native \
*->subversion-native \
*->git-native \
@@ -90,7 +91,16 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
# (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the
# dependency incidentally. This improves determinism and avoids build
# failures when people switch to external toolchains.
-SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native"
+SSTATE_EXCLUDEDEPS_SYSROOT += "\
+ .*->autoconf-native \
+ .*->automake-native \
+ .*->bison-native \
+ .*->meson-native \
+ .*->ninja-native \
+ .*->patch-native \
+ .*->pkgconfig-native \
+ .*->quilt-native \
+"
# Nothing needs to depend on libc-initial
# base-passwd/shadow-sysroot don't need their dependencies
SSTATE_EXCLUDEDEPS_SYSROOT += "\
diff --git a/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
index 101d5331bc..6fd12fb842 100644
--- a/meta/conf/machine/include/mips/feature-mips-mips16e.inc
+++ b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
@@ -11,7 +11,7 @@ MIPSPKGSFX_MIPS16E .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', '-m16',
TUNEVALID[no-interlink-compressed] = "Disable mixing of standard and MIPS16e code"
MIPS16_TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-interlink-compressed', ' -mno-interlink-compressed', ' -minterlink-compressed', d)}"
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' ${MIPS16_TUNE_CCARGS}', '', d)}"
-OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ':mips16e', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', 'mips16e:', '', d)}"
# show status (if compiling in MIPS16e mode)
BUILDCFG_VARS += "${@['', 'MIPS_INSTRUCTION_SET'][d.getVar('MIPS_INSTRUCTION_SET') == 'mips16e']}"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index c7136da711..642c322abc 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
# Use a common kernel recipe for all QEMU machines
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native"
+EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
# Provide the nfs server kernel module for all qemu images
KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
index 958b3490e8..44e4b4ec46 100644
--- a/meta/conf/machine/include/x86/x86-base.inc
+++ b/meta/conf/machine/include/x86/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
# kernel-related variables
#
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "5.13%"
+PREFERRED_VERSION_linux-yocto ??= "5.14%"
#
# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 93d855b6e1..1bd4e3e154 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "zImage"
-UBOOT_MACHINE ?= "qemu:arm_defconfig"
+UBOOT_MACHINE ?= "qemu_arm_defconfig"
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -20,7 +20,7 @@ QB_SMP = "-smp 4"
# Standard Serial console
QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
-QB_GRAPHICS = "-device VGA,edid=on"
+QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
# Virtio Networking support
QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index ea7fae2722..f245152168 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "Image"
-UBOOT_MACHINE ?= "qemu:arm64_defconfig"
+UBOOT_MACHINE ?= "qemu_arm64_defconfig"
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -19,7 +19,7 @@ QB_CPU = "-cpu cortex-a57"
QB_SMP = "-smp 4"
QB_CPU_KVM = "-cpu host -machine gic-version=3"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
-QB_GRAPHICS = "-device VGA,edid=on"
+QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
# Virtio Networking support
QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 6c99a52965..3c2c4997b9 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -13,8 +13,9 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine versatilepb"
QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
-QB_OPT_APPEND = "-usb -device usb-tablet"
-PREFERRED_VERSION_linux-yocto ??= "5.13%"
+QB_GRAPHICS = "-device virtio-gpu-pci"
+QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
+PREFERRED_VERSION_linux-yocto ??= "5.14%"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
KMACHINE:qemuarmv5 = "qemuarm"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 8a8db582df..7f3b9463ef 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,6 +11,8 @@ STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot"
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
+
INHERIT += "multilib_global"
BBCLASSEXTEND:append = " ${MULTILIBS}"
diff --git a/meta/files/rust-ccld-wrapper.c b/meta/files/rust-ccld-wrapper.c
deleted file mode 100644
index 6bc9958b90..0000000000
--- a/meta/files/rust-ccld-wrapper.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Richard Purdie
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * Run the original script (argv[0] + ".real") with LD_LIBRARY_PATH unset
- * This avoids issues where cargo is running a wrapper script using /bin/sh from the host
- * which links to something which has an incompatible version in in recipe-sysroot-native
- * such as libtinfo on centos 7.
- */
-
-int main(int argc, char* argv[]) {
- char *real = malloc(strlen(argv[0] + 5));
- strcpy(real, argv[0]);
- strcpy(real + strlen(argv[0]), ".real");
- putenv("LD_LIBRARY_PATH=");
- if(execv(real, argv) == -1) {
- printf("Wrapper failed to execute, error: %s\n", strerror(errno));
- return -1;
- }
-}
diff --git a/meta/files/spdx-licenses.json b/meta/files/spdx-licenses.json
index 582c73ca64..ef926164ec 100644
--- a/meta/files/spdx-licenses.json
+++ b/meta/files/spdx-licenses.json
@@ -1,5 +1,5 @@
{
- "licenseListVersion": "7bcf79d",
+ "licenseListVersion": "3.14",
"licenses": [
{
"reference": "https://spdx.org/licenses/GPL-1.0.html",
@@ -14,10 +14,23 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/bzip2-1.0.6.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/bzip2-1.0.6.json",
+ "referenceNumber": 1,
+ "name": "bzip2 and libbzip2 License v1.0.6",
+ "licenseId": "bzip2-1.0.6",
+ "seeAlso": [
+ "https://sourceware.org/git/?p\u003dbzip2.git;a\u003dblob;f\u003dLICENSE;hb\u003dbzip2-1.0.6",
+ "http://bzip.org/1.0.5/bzip2-manual-1.0.5.html"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/Intel-ACPI.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Intel-ACPI.json",
- "referenceNumber": 1,
+ "referenceNumber": 2,
"name": "Intel ACPI Software License Agreement",
"licenseId": "Intel-ACPI",
"seeAlso": [
@@ -29,7 +42,7 @@
"reference": "https://spdx.org/licenses/XSkat.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/XSkat.json",
- "referenceNumber": 2,
+ "referenceNumber": 3,
"name": "XSkat License",
"licenseId": "XSkat",
"seeAlso": [
@@ -41,7 +54,7 @@
"reference": "https://spdx.org/licenses/CC-BY-NC-SA-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-2.0.json",
- "referenceNumber": 3,
+ "referenceNumber": 4,
"name": "Creative Commons Attribution Non Commercial Share Alike 2.0 Generic",
"licenseId": "CC-BY-NC-SA-2.0",
"seeAlso": [
@@ -50,15 +63,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/bzip2-1.0.6.html",
+ "reference": "https://spdx.org/licenses/Plexus.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/bzip2-1.0.6.json",
- "referenceNumber": 4,
- "name": "bzip2 and libbzip2 License v1.0.6",
- "licenseId": "bzip2-1.0.6",
+ "detailsUrl": "https://spdx.org/licenses/Plexus.json",
+ "referenceNumber": 5,
+ "name": "Plexus Classworlds License",
+ "licenseId": "Plexus",
"seeAlso": [
- "https://sourceware.org/git/?p\u003dbzip2.git;a\u003dblob;f\u003dLICENSE;hb\u003dbzip2-1.0.6",
- "http://bzip.org/1.0.5/bzip2-manual-1.0.5.html"
+ "https://fedoraproject.org/wiki/Licensing/Plexus_Classworlds_License"
],
"isOsiApproved": false
},
@@ -66,7 +78,7 @@
"reference": "https://spdx.org/licenses/Giftware.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Giftware.json",
- "referenceNumber": 5,
+ "referenceNumber": 6,
"name": "Giftware License",
"licenseId": "Giftware",
"seeAlso": [
@@ -75,18 +87,6 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Plexus.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Plexus.json",
- "referenceNumber": 6,
- "name": "Plexus Classworlds License",
- "licenseId": "Plexus",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Plexus_Classworlds_License"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/BitTorrent-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/BitTorrent-1.0.json",
@@ -185,24 +185,10 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/W3C.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/W3C.json",
- "referenceNumber": 15,
- "name": "W3C Software Notice and License (2002-12-31)",
- "licenseId": "W3C",
- "seeAlso": [
- "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.html",
- "https://opensource.org/licenses/W3C"
- ],
- "isOsiApproved": true,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/JPNIC.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/JPNIC.json",
- "referenceNumber": 16,
+ "referenceNumber": 15,
"name": "Japan Network Information Center License",
"licenseId": "JPNIC",
"seeAlso": [
@@ -214,7 +200,7 @@
"reference": "https://spdx.org/licenses/SAX-PD.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/SAX-PD.json",
- "referenceNumber": 17,
+ "referenceNumber": 16,
"name": "Sax Public Domain Notice",
"licenseId": "SAX-PD",
"seeAlso": [
@@ -226,7 +212,7 @@
"reference": "https://spdx.org/licenses/CC-BY-ND-2.5.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-ND-2.5.json",
- "referenceNumber": 18,
+ "referenceNumber": 17,
"name": "Creative Commons Attribution No Derivatives 2.5 Generic",
"licenseId": "CC-BY-ND-2.5",
"seeAlso": [
@@ -235,6 +221,19 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/eGenix.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/eGenix.json",
+ "referenceNumber": 18,
+ "name": "eGenix.com Public License 1.1.0",
+ "licenseId": "eGenix",
+ "seeAlso": [
+ "http://www.egenix.com/products/eGenix.com-Public-License-1.1.0.pdf",
+ "https://fedoraproject.org/wiki/Licensing/eGenix.com_Public_License_1.1.0"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/LGPLLR.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/LGPLLR.json",
@@ -247,27 +246,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/eGenix.html",
+ "reference": "https://spdx.org/licenses/OLDAP-2.2.2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/eGenix.json",
+ "detailsUrl": "https://spdx.org/licenses/OLDAP-2.2.2.json",
"referenceNumber": 20,
- "name": "eGenix.com Public License 1.1.0",
- "licenseId": "eGenix",
+ "name": "Open LDAP Public License 2.2.2",
+ "licenseId": "OLDAP-2.2.2",
"seeAlso": [
- "http://www.egenix.com/products/eGenix.com-Public-License-1.1.0.pdf",
- "https://fedoraproject.org/wiki/Licensing/eGenix.com_Public_License_1.1.0"
+ "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003ddf2cc1e21eb7c160695f5b7cffd6296c151ba188"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OLDAP-2.2.2.html",
+ "reference": "https://spdx.org/licenses/CC-BY-ND-3.0-DE.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OLDAP-2.2.2.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-3.0-DE.json",
"referenceNumber": 21,
- "name": "Open LDAP Public License 2.2.2",
- "licenseId": "OLDAP-2.2.2",
+ "name": "Creative Commons Attribution No Derivatives 3.0 Germany",
+ "licenseId": "CC-BY-ND-3.0-DE",
"seeAlso": [
- "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003ddf2cc1e21eb7c160695f5b7cffd6296c151ba188"
+ "https://creativecommons.org/licenses/by-nd/3.0/de/legalcode"
],
"isOsiApproved": false
},
@@ -285,22 +283,10 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-ND-3.0-DE.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-3.0-DE.json",
- "referenceNumber": 23,
- "name": "Creative Commons Attribution No Derivatives 3.0 Germany",
- "licenseId": "CC-BY-ND-3.0-DE",
- "seeAlso": [
- "https://creativecommons.org/licenses/by-nd/3.0/de/legalcode"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/NCSA.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/NCSA.json",
- "referenceNumber": 24,
+ "referenceNumber": 23,
"name": "University of Illinois/NCSA Open Source License",
"licenseId": "NCSA",
"seeAlso": [
@@ -311,27 +297,28 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/PHP-3.01.html",
+ "reference": "https://spdx.org/licenses/W3C.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/PHP-3.01.json",
- "referenceNumber": 25,
- "name": "PHP License v3.01",
- "licenseId": "PHP-3.01",
+ "detailsUrl": "https://spdx.org/licenses/W3C.json",
+ "referenceNumber": 24,
+ "name": "W3C Software Notice and License (2002-12-31)",
+ "licenseId": "W3C",
"seeAlso": [
- "http://www.php.net/license/3_01.txt"
+ "http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.html",
+ "https://opensource.org/licenses/W3C"
],
"isOsiApproved": true,
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-PDDC.html",
+ "reference": "https://spdx.org/licenses/Adobe-2006.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-PDDC.json",
- "referenceNumber": 26,
- "name": "Creative Commons Public Domain Dedication and Certification",
- "licenseId": "CC-PDDC",
+ "detailsUrl": "https://spdx.org/licenses/Adobe-2006.json",
+ "referenceNumber": 25,
+ "name": "Adobe Systems Incorporated Source Code License Agreement",
+ "licenseId": "Adobe-2006",
"seeAlso": [
- "https://creativecommons.org/licenses/publicdomain/"
+ "https://fedoraproject.org/wiki/Licensing/AdobeLicense"
],
"isOsiApproved": false
},
@@ -339,7 +326,7 @@
"reference": "https://spdx.org/licenses/Net-SNMP.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Net-SNMP.json",
- "referenceNumber": 27,
+ "referenceNumber": 26,
"name": "Net-SNMP License",
"licenseId": "Net-SNMP",
"seeAlso": [
@@ -348,6 +335,19 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/CC-BY-SA-4.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-4.0.json",
+ "referenceNumber": 27,
+ "name": "Creative Commons Attribution Share Alike 4.0 International",
+ "licenseId": "CC-BY-SA-4.0",
+ "seeAlso": [
+ "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+ ],
+ "isOsiApproved": false,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/YPL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/YPL-1.0.json",
@@ -360,22 +360,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Adobe-2006.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Adobe-2006.json",
- "referenceNumber": 29,
- "name": "Adobe Systems Incorporated Source Code License Agreement",
- "licenseId": "Adobe-2006",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/AdobeLicense"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/Nunit.html",
"isDeprecatedLicenseId": true,
"detailsUrl": "https://spdx.org/licenses/Nunit.json",
- "referenceNumber": 30,
+ "referenceNumber": 29,
"name": "Nunit License",
"licenseId": "Nunit",
"seeAlso": [
@@ -387,7 +375,7 @@
"reference": "https://spdx.org/licenses/MITNFA.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MITNFA.json",
- "referenceNumber": 31,
+ "referenceNumber": 30,
"name": "MIT +no-false-attribs license",
"licenseId": "MITNFA",
"seeAlso": [
@@ -396,6 +384,19 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/PHP-3.01.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/PHP-3.01.json",
+ "referenceNumber": 31,
+ "name": "PHP License v3.01",
+ "licenseId": "PHP-3.01",
+ "seeAlso": [
+ "http://www.php.net/license/3_01.txt"
+ ],
+ "isOsiApproved": true,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/BSD-Source-Code.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/BSD-Source-Code.json",
@@ -420,18 +421,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OPUBL-1.0.html",
+ "reference": "https://spdx.org/licenses/Motosoto.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OPUBL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/Motosoto.json",
"referenceNumber": 34,
- "name": "Open Publication License v1.0",
- "licenseId": "OPUBL-1.0",
+ "name": "Motosoto License",
+ "licenseId": "Motosoto",
"seeAlso": [
- "http://opencontent.org/openpub/",
- "https://www.debian.org/opl",
- "https://www.ctan.org/license/opl"
+ "https://opensource.org/licenses/Motosoto"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/OSL-1.1.html",
@@ -447,41 +446,40 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-SA-4.0.html",
+ "reference": "https://spdx.org/licenses/NGPL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-4.0.json",
+ "detailsUrl": "https://spdx.org/licenses/NGPL.json",
"referenceNumber": 36,
- "name": "Creative Commons Attribution Share Alike 4.0 International",
- "licenseId": "CC-BY-SA-4.0",
+ "name": "Nethack General Public License",
+ "licenseId": "NGPL",
"seeAlso": [
- "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+ "https://opensource.org/licenses/NGPL"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Unicode-TOU.html",
+ "reference": "https://spdx.org/licenses/CC-BY-2.5-AU.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Unicode-TOU.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-2.5-AU.json",
"referenceNumber": 37,
- "name": "Unicode Terms of Use",
- "licenseId": "Unicode-TOU",
+ "name": "Creative Commons Attribution 2.5 Australia",
+ "licenseId": "CC-BY-2.5-AU",
"seeAlso": [
- "http://www.unicode.org/copyright.html"
+ "https://creativecommons.org/licenses/by/2.5/au/legalcode"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/NGPL.html",
+ "reference": "https://spdx.org/licenses/Unicode-TOU.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NGPL.json",
+ "detailsUrl": "https://spdx.org/licenses/Unicode-TOU.json",
"referenceNumber": 38,
- "name": "Nethack General Public License",
- "licenseId": "NGPL",
+ "name": "Unicode Terms of Use",
+ "licenseId": "Unicode-TOU",
"seeAlso": [
- "https://opensource.org/licenses/NGPL"
+ "http://www.unicode.org/copyright.html"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License.html",
@@ -496,16 +494,18 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Motosoto.html",
+ "reference": "https://spdx.org/licenses/OPUBL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Motosoto.json",
+ "detailsUrl": "https://spdx.org/licenses/OPUBL-1.0.json",
"referenceNumber": 40,
- "name": "Motosoto License",
- "licenseId": "Motosoto",
+ "name": "Open Publication License v1.0",
+ "licenseId": "OPUBL-1.0",
"seeAlso": [
- "https://opensource.org/licenses/Motosoto"
+ "http://opencontent.org/openpub/",
+ "https://www.debian.org/opl",
+ "https://www.ctan.org/license/opl"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK.html",
@@ -520,47 +520,35 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/gnuplot.html",
+ "reference": "https://spdx.org/licenses/NLOD-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/gnuplot.json",
+ "detailsUrl": "https://spdx.org/licenses/NLOD-2.0.json",
"referenceNumber": 42,
- "name": "gnuplot License",
- "licenseId": "gnuplot",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Gnuplot"
- ],
- "isOsiApproved": false,
- "isFsfLibre": true
- },
- {
- "reference": "https://spdx.org/licenses/Eurosym.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Eurosym.json",
- "referenceNumber": 43,
- "name": "Eurosym License",
- "licenseId": "Eurosym",
+ "name": "Norwegian Licence for Open Government Data (NLOD) 2.0",
+ "licenseId": "NLOD-2.0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Eurosym"
+ "http://data.norge.no/nlod/en/2.0"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-2.5-AU.html",
+ "reference": "https://spdx.org/licenses/gnuplot.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-2.5-AU.json",
- "referenceNumber": 44,
- "name": "Creative Commons Attribution 2.5 Australia",
- "licenseId": "CC-BY-2.5-AU",
+ "detailsUrl": "https://spdx.org/licenses/gnuplot.json",
+ "referenceNumber": 43,
+ "name": "gnuplot License",
+ "licenseId": "gnuplot",
"seeAlso": [
- "https://creativecommons.org/licenses/by/2.5/au/legalcode"
+ "https://fedoraproject.org/wiki/Licensing/Gnuplot"
],
- "isOsiApproved": false
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/EPICS.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EPICS.json",
- "referenceNumber": 45,
+ "referenceNumber": 44,
"name": "EPICS Open License",
"licenseId": "EPICS",
"seeAlso": [
@@ -572,7 +560,7 @@
"reference": "https://spdx.org/licenses/Info-ZIP.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Info-ZIP.json",
- "referenceNumber": 46,
+ "referenceNumber": 45,
"name": "Info-ZIP License",
"licenseId": "Info-ZIP",
"seeAlso": [
@@ -584,7 +572,7 @@
"reference": "https://spdx.org/licenses/OLDAP-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OLDAP-2.0.json",
- "referenceNumber": 47,
+ "referenceNumber": 46,
"name": "Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)",
"licenseId": "OLDAP-2.0",
"seeAlso": [
@@ -593,6 +581,18 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/CERN-OHL-P-2.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CERN-OHL-P-2.0.json",
+ "referenceNumber": 47,
+ "name": "CERN Open Hardware Licence Version 2 - Permissive",
+ "licenseId": "CERN-OHL-P-2.0",
+ "seeAlso": [
+ "https://www.ohwr.org/project/cernohl/wikis/Documents/CERN-OHL-version-2"
+ ],
+ "isOsiApproved": true
+ },
+ {
"reference": "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-Warranty.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-No-Nuclear-Warranty.json",
@@ -605,22 +605,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CERN-OHL-P-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CERN-OHL-P-2.0.json",
- "referenceNumber": 49,
- "name": "CERN Open Hardware Licence Version 2 - Permissive",
- "licenseId": "CERN-OHL-P-2.0",
- "seeAlso": [
- "https://www.ohwr.org/project/cernohl/wikis/Documents/CERN-OHL-version-2"
- ],
- "isOsiApproved": true
- },
- {
"reference": "https://spdx.org/licenses/AML.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/AML.json",
- "referenceNumber": 50,
+ "referenceNumber": 49,
"name": "Apple MIT License",
"licenseId": "AML",
"seeAlso": [
@@ -632,7 +620,7 @@
"reference": "https://spdx.org/licenses/MulanPSL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MulanPSL-1.0.json",
- "referenceNumber": 51,
+ "referenceNumber": 50,
"name": "Mulan Permissive Software License, Version 1",
"licenseId": "MulanPSL-1.0",
"seeAlso": [
@@ -642,6 +630,18 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/Multics.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/Multics.json",
+ "referenceNumber": 51,
+ "name": "Multics License",
+ "licenseId": "Multics",
+ "seeAlso": [
+ "https://opensource.org/licenses/Multics"
+ ],
+ "isOsiApproved": true
+ },
+ {
"reference": "https://spdx.org/licenses/VSL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/VSL-1.0.json",
@@ -654,39 +654,38 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/NLOD-2.0.html",
+ "reference": "https://spdx.org/licenses/RSA-MD.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NLOD-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/RSA-MD.json",
"referenceNumber": 53,
- "name": "Norwegian Licence for Open Government Data (NLOD) 2.0",
- "licenseId": "NLOD-2.0",
+ "name": "RSA Message-Digest License",
+ "licenseId": "RSA-MD",
"seeAlso": [
- "http://data.norge.no/nlod/en/2.0"
+ "http://www.faqs.org/rfcs/rfc1321.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/RSA-MD.html",
+ "reference": "https://spdx.org/licenses/CC-PDDC.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/RSA-MD.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-PDDC.json",
"referenceNumber": 54,
- "name": "RSA Message-Digest License",
- "licenseId": "RSA-MD",
+ "name": "Creative Commons Public Domain Dedication and Certification",
+ "licenseId": "CC-PDDC",
"seeAlso": [
- "http://www.faqs.org/rfcs/rfc1321.html"
+ "https://creativecommons.org/licenses/publicdomain/"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/O-UDA-1.0.html",
+ "reference": "https://spdx.org/licenses/CC-BY-SA-2.1-JP.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/O-UDA-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-2.1-JP.json",
"referenceNumber": 55,
- "name": "Open Use of Data Agreement v1.0",
- "licenseId": "O-UDA-1.0",
+ "name": "Creative Commons Attribution Share Alike 2.1 Japan",
+ "licenseId": "CC-BY-SA-2.1-JP",
"seeAlso": [
- "https://github.com/microsoft/Open-Use-of-Data-Agreement/blob/v1.0/O-UDA-1.0.md",
- "https://cdla.dev/open-use-of-data-agreement-v1-0/"
+ "https://creativecommons.org/licenses/by-sa/2.1/jp/legalcode"
],
"isOsiApproved": false
},
@@ -704,22 +703,10 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-SA-2.1-JP.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-2.1-JP.json",
- "referenceNumber": 57,
- "name": "Creative Commons Attribution Share Alike 2.1 Japan",
- "licenseId": "CC-BY-SA-2.1-JP",
- "seeAlso": [
- "https://creativecommons.org/licenses/by-sa/2.1/jp/legalcode"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/Spencer-94.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Spencer-94.json",
- "referenceNumber": 58,
+ "referenceNumber": 57,
"name": "Spencer License 94",
"licenseId": "Spencer-94",
"seeAlso": [
@@ -731,7 +718,7 @@
"reference": "https://spdx.org/licenses/OLDAP-1.2.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OLDAP-1.2.json",
- "referenceNumber": 59,
+ "referenceNumber": 58,
"name": "Open LDAP Public License v1.2",
"licenseId": "OLDAP-1.2",
"seeAlso": [
@@ -740,6 +727,19 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/O-UDA-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/O-UDA-1.0.json",
+ "referenceNumber": 59,
+ "name": "Open Use of Data Agreement v1.0",
+ "licenseId": "O-UDA-1.0",
+ "seeAlso": [
+ "https://github.com/microsoft/Open-Use-of-Data-Agreement/blob/v1.0/O-UDA-1.0.md",
+ "https://cdla.dev/open-use-of-data-agreement-v1-0/"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/OLDAP-2.7.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OLDAP-2.7.json",
@@ -802,22 +802,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BSD-Protection.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-Protection.json",
- "referenceNumber": 65,
- "name": "BSD Protection License",
- "licenseId": "BSD-Protection",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/BSD_Protection_License"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/LiLiQ-R-1.1.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/LiLiQ-R-1.1.json",
- "referenceNumber": 66,
+ "referenceNumber": 65,
"name": "Licence Libre du Québec – Réciprocité version 1.1",
"licenseId": "LiLiQ-R-1.1",
"seeAlso": [
@@ -830,7 +818,7 @@
"reference": "https://spdx.org/licenses/Noweb.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Noweb.json",
- "referenceNumber": 67,
+ "referenceNumber": 66,
"name": "Noweb License",
"licenseId": "Noweb",
"seeAlso": [
@@ -839,22 +827,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3-invariants-or-later.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-invariants-or-later.json",
- "referenceNumber": 68,
- "name": "GNU Free Documentation License v1.3 or later - invariants",
- "licenseId": "GFDL-1.3-invariants-or-later",
- "seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/CC0-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC0-1.0.json",
- "referenceNumber": 69,
+ "referenceNumber": 67,
"name": "Creative Commons Zero v1.0 Universal",
"licenseId": "CC0-1.0",
"seeAlso": [
@@ -864,10 +840,22 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/BSD-Protection.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/BSD-Protection.json",
+ "referenceNumber": 68,
+ "name": "BSD Protection License",
+ "licenseId": "BSD-Protection",
+ "seeAlso": [
+ "https://fedoraproject.org/wiki/Licensing/BSD_Protection_License"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/CC-BY-NC-2.5.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-NC-2.5.json",
- "referenceNumber": 70,
+ "referenceNumber": 69,
"name": "Creative Commons Attribution Non Commercial 2.5 Generic",
"licenseId": "CC-BY-NC-2.5",
"seeAlso": [
@@ -879,7 +867,7 @@
"reference": "https://spdx.org/licenses/Zlib.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Zlib.json",
- "referenceNumber": 71,
+ "referenceNumber": 70,
"name": "zlib License",
"licenseId": "Zlib",
"seeAlso": [
@@ -890,14 +878,14 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.1-invariants-or-later.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.3-invariants-or-later.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.1-invariants-or-later.json",
- "referenceNumber": 72,
- "name": "GNU Free Documentation License v1.1 or later - invariants",
- "licenseId": "GFDL-1.1-invariants-or-later",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-invariants-or-later.json",
+ "referenceNumber": 71,
+ "name": "GNU Free Documentation License v1.3 or later - invariants",
+ "licenseId": "GFDL-1.3-invariants-or-later",
"seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt"
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
],
"isOsiApproved": false
},
@@ -905,7 +893,7 @@
"reference": "https://spdx.org/licenses/CC-BY-3.0-AT.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-3.0-AT.json",
- "referenceNumber": 73,
+ "referenceNumber": 72,
"name": "Creative Commons Attribution 3.0 Austria",
"licenseId": "CC-BY-3.0-AT",
"seeAlso": [
@@ -917,7 +905,7 @@
"reference": "https://spdx.org/licenses/LPPL-1.3c.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/LPPL-1.3c.json",
- "referenceNumber": 74,
+ "referenceNumber": 73,
"name": "LaTeX Project Public License v1.3c",
"licenseId": "LPPL-1.3c",
"seeAlso": [
@@ -930,7 +918,7 @@
"reference": "https://spdx.org/licenses/EPL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EPL-1.0.json",
- "referenceNumber": 75,
+ "referenceNumber": 74,
"name": "Eclipse Public License 1.0",
"licenseId": "EPL-1.0",
"seeAlso": [
@@ -941,6 +929,18 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/GFDL-1.1-invariants-or-later.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.1-invariants-or-later.json",
+ "referenceNumber": 75,
+ "name": "GNU Free Documentation License v1.1 or later - invariants",
+ "licenseId": "GFDL-1.1-invariants-or-later",
+ "seeAlso": [
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/ANTLR-PD-fallback.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/ANTLR-PD-fallback.json",
@@ -965,22 +965,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Multics.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Multics.json",
- "referenceNumber": 78,
- "name": "Multics License",
- "licenseId": "Multics",
- "seeAlso": [
- "https://opensource.org/licenses/Multics"
- ],
- "isOsiApproved": true
- },
- {
"reference": "https://spdx.org/licenses/OLDAP-2.3.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OLDAP-2.3.json",
- "referenceNumber": 79,
+ "referenceNumber": 78,
"name": "Open LDAP Public License v2.3",
"licenseId": "OLDAP-2.3",
"seeAlso": [
@@ -993,7 +981,7 @@
"reference": "https://spdx.org/licenses/ZPL-2.1.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/ZPL-2.1.json",
- "referenceNumber": 80,
+ "referenceNumber": 79,
"name": "Zope Public License 2.1",
"licenseId": "ZPL-2.1",
"seeAlso": [
@@ -1003,22 +991,24 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-SA-3.0-DE.html",
+ "reference": "https://spdx.org/licenses/Apache-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-3.0-DE.json",
- "referenceNumber": 81,
- "name": "Creative Commons Attribution Share Alike 3.0 Germany",
- "licenseId": "CC-BY-SA-3.0-DE",
+ "detailsUrl": "https://spdx.org/licenses/Apache-2.0.json",
+ "referenceNumber": 80,
+ "name": "Apache License 2.0",
+ "licenseId": "Apache-2.0",
"seeAlso": [
- "https://creativecommons.org/licenses/by-sa/3.0/de/legalcode"
+ "https://www.apache.org/licenses/LICENSE-2.0",
+ "https://opensource.org/licenses/Apache-2.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/SGI-B-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/SGI-B-2.0.json",
- "referenceNumber": 82,
+ "referenceNumber": 81,
"name": "SGI Free Software License B v2.0",
"licenseId": "SGI-B-2.0",
"seeAlso": [
@@ -1028,24 +1018,10 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/Apache-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Apache-2.0.json",
- "referenceNumber": 83,
- "name": "Apache License 2.0",
- "licenseId": "Apache-2.0",
- "seeAlso": [
- "https://www.apache.org/licenses/LICENSE-2.0",
- "https://opensource.org/licenses/Apache-2.0"
- ],
- "isOsiApproved": true,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/Hippocratic-2.1.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Hippocratic-2.1.json",
- "referenceNumber": 84,
+ "referenceNumber": 82,
"name": "Hippocratic License 2.1",
"licenseId": "Hippocratic-2.1",
"seeAlso": [
@@ -1055,10 +1031,22 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/CC-BY-SA-3.0-DE.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-3.0-DE.json",
+ "referenceNumber": 83,
+ "name": "Creative Commons Attribution Share Alike 3.0 Germany",
+ "licenseId": "CC-BY-SA-3.0-DE",
+ "seeAlso": [
+ "https://creativecommons.org/licenses/by-sa/3.0/de/legalcode"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/CC-BY-NC-SA-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-1.0.json",
- "referenceNumber": 85,
+ "referenceNumber": 84,
"name": "Creative Commons Attribution Non Commercial Share Alike 1.0 Generic",
"licenseId": "CC-BY-NC-SA-1.0",
"seeAlso": [
@@ -1067,6 +1055,20 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/LGPL-2.1-or-later.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/LGPL-2.1-or-later.json",
+ "referenceNumber": 85,
+ "name": "GNU Lesser General Public License v2.1 or later",
+ "licenseId": "LGPL-2.1-or-later",
+ "seeAlso": [
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
+ "https://opensource.org/licenses/LGPL-2.1"
+ ],
+ "isOsiApproved": true,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/CC-BY-3.0-US.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-3.0-US.json",
@@ -1103,18 +1105,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LGPL-2.1-or-later.html",
+ "reference": "https://spdx.org/licenses/Eurosym.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LGPL-2.1-or-later.json",
+ "detailsUrl": "https://spdx.org/licenses/Eurosym.json",
"referenceNumber": 89,
- "name": "GNU Lesser General Public License v2.1 or later",
- "licenseId": "LGPL-2.1-or-later",
+ "name": "Eurosym License",
+ "licenseId": "Eurosym",
"seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
- "https://opensource.org/licenses/LGPL-2.1"
+ "https://fedoraproject.org/wiki/Licensing/Eurosym"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/GFDL-1.1.html",
@@ -1178,14 +1178,14 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Unicode-DFS-2015.html",
+ "reference": "https://spdx.org/licenses/libtiff.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Unicode-DFS-2015.json",
+ "detailsUrl": "https://spdx.org/licenses/libtiff.json",
"referenceNumber": 95,
- "name": "Unicode License Agreement - Data Files and Software (2015)",
- "licenseId": "Unicode-DFS-2015",
+ "name": "libtiff License",
+ "licenseId": "libtiff",
"seeAlso": [
- "https://web.archive.org/web/20151224134844/http://unicode.org/copyright.html"
+ "https://fedoraproject.org/wiki/Licensing/libtiff"
],
"isOsiApproved": false
},
@@ -1253,18 +1253,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/MPL-1.1.html",
+ "reference": "https://spdx.org/licenses/Unicode-DFS-2015.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MPL-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/Unicode-DFS-2015.json",
"referenceNumber": 101,
- "name": "Mozilla Public License 1.1",
- "licenseId": "MPL-1.1",
+ "name": "Unicode License Agreement - Data Files and Software (2015)",
+ "licenseId": "Unicode-DFS-2015",
"seeAlso": [
- "http://www.mozilla.org/MPL/MPL-1.1.html",
- "https://opensource.org/licenses/MPL-1.1"
+ "https://web.archive.org/web/20151224134844/http://unicode.org/copyright.html"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/GFDL-1.2-only.html",
@@ -1280,34 +1278,24 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CNRI-Jython.html",
+ "reference": "https://spdx.org/licenses/MPL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CNRI-Jython.json",
+ "detailsUrl": "https://spdx.org/licenses/MPL-1.1.json",
"referenceNumber": 103,
- "name": "CNRI Jython License",
- "licenseId": "CNRI-Jython",
- "seeAlso": [
- "http://www.jython.org/license.html"
- ],
- "isOsiApproved": false
- },
- {
- "reference": "https://spdx.org/licenses/ZPL-1.1.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/ZPL-1.1.json",
- "referenceNumber": 104,
- "name": "Zope Public License 1.1",
- "licenseId": "ZPL-1.1",
+ "name": "Mozilla Public License 1.1",
+ "licenseId": "MPL-1.1",
"seeAlso": [
- "http://old.zope.org/Resources/License/ZPL-1.1"
+ "http://www.mozilla.org/MPL/MPL-1.1.html",
+ "https://opensource.org/licenses/MPL-1.1"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/GPL-2.0-only.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/GPL-2.0-only.json",
- "referenceNumber": 105,
+ "referenceNumber": 104,
"name": "GNU General Public License v2.0 only",
"licenseId": "GPL-2.0-only",
"seeAlso": [
@@ -1318,6 +1306,18 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/CC-BY-NC-4.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-4.0.json",
+ "referenceNumber": 105,
+ "name": "Creative Commons Attribution Non Commercial 4.0 International",
+ "licenseId": "CC-BY-NC-4.0",
+ "seeAlso": [
+ "https://creativecommons.org/licenses/by-nc/4.0/legalcode"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/FreeImage.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/FreeImage.json",
@@ -1342,41 +1342,40 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-NC-4.0.html",
+ "reference": "https://spdx.org/licenses/CNRI-Jython.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-4.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CNRI-Jython.json",
"referenceNumber": 108,
- "name": "Creative Commons Attribution Non Commercial 4.0 International",
- "licenseId": "CC-BY-NC-4.0",
+ "name": "CNRI Jython License",
+ "licenseId": "CNRI-Jython",
"seeAlso": [
- "https://creativecommons.org/licenses/by-nc/4.0/legalcode"
+ "http://www.jython.org/license.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Rdisc.html",
+ "reference": "https://spdx.org/licenses/ZPL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Rdisc.json",
+ "detailsUrl": "https://spdx.org/licenses/ZPL-1.1.json",
"referenceNumber": 109,
- "name": "Rdisc License",
- "licenseId": "Rdisc",
+ "name": "Zope Public License 1.1",
+ "licenseId": "ZPL-1.1",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Rdisc_License"
+ "http://old.zope.org/Resources/License/ZPL-1.1"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html",
+ "reference": "https://spdx.org/licenses/Afmparse.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.json",
+ "detailsUrl": "https://spdx.org/licenses/Afmparse.json",
"referenceNumber": 110,
- "name": "Mozilla Public License 2.0 (no copyleft exception)",
- "licenseId": "MPL-2.0-no-copyleft-exception",
+ "name": "Afmparse License",
+ "licenseId": "Afmparse",
"seeAlso": [
- "http://www.mozilla.org/MPL/2.0/",
- "https://opensource.org/licenses/MPL-2.0"
+ "https://fedoraproject.org/wiki/Licensing/Afmparse"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/OLDAP-2.1.html",
@@ -1391,14 +1390,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/libtiff.html",
+ "reference": "https://spdx.org/licenses/Rdisc.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/libtiff.json",
+ "detailsUrl": "https://spdx.org/licenses/Rdisc.json",
"referenceNumber": 112,
- "name": "libtiff License",
- "licenseId": "libtiff",
+ "name": "Rdisc License",
+ "licenseId": "Rdisc",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/libtiff"
+ "https://fedoraproject.org/wiki/Licensing/Rdisc_License"
],
"isOsiApproved": false
},
@@ -1429,16 +1428,17 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/AAL.html",
+ "reference": "https://spdx.org/licenses/Sendmail.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/AAL.json",
+ "detailsUrl": "https://spdx.org/licenses/Sendmail.json",
"referenceNumber": 115,
- "name": "Attribution Assurance License",
- "licenseId": "AAL",
+ "name": "Sendmail License",
+ "licenseId": "Sendmail",
"seeAlso": [
- "https://opensource.org/licenses/attribution"
+ "http://www.sendmail.com/pdfs/open_source/sendmail_license.pdf",
+ "https://web.archive.org/web/20160322142305/https://www.sendmail.com/pdfs/open_source/sendmail_license.pdf"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/CC-BY-2.5.html",
@@ -1453,39 +1453,39 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/APSL-1.2.html",
+ "reference": "https://spdx.org/licenses/AAL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/APSL-1.2.json",
+ "detailsUrl": "https://spdx.org/licenses/AAL.json",
"referenceNumber": 117,
- "name": "Apple Public Source License 1.2",
- "licenseId": "APSL-1.2",
+ "name": "Attribution Assurance License",
+ "licenseId": "AAL",
"seeAlso": [
- "http://www.samurajdata.se/opensource/mirror/licenses/apsl.php"
+ "https://opensource.org/licenses/attribution"
],
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/OFL-1.0-no-RFN.html",
+ "reference": "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OFL-1.0-no-RFN.json",
+ "detailsUrl": "https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.json",
"referenceNumber": 118,
- "name": "SIL Open Font License 1.0 with no Reserved Font Name",
- "licenseId": "OFL-1.0-no-RFN",
+ "name": "Mozilla Public License 2.0 (no copyleft exception)",
+ "licenseId": "MPL-2.0-no-copyleft-exception",
"seeAlso": [
- "http://scripts.sil.org/cms/scripts/page.php?item_id\u003dOFL10_web"
+ "http://www.mozilla.org/MPL/2.0/",
+ "https://opensource.org/licenses/MPL-2.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Sendmail.html",
+ "reference": "https://spdx.org/licenses/CC-BY-NC-ND-2.5.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Sendmail.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-ND-2.5.json",
"referenceNumber": 119,
- "name": "Sendmail License",
- "licenseId": "Sendmail",
+ "name": "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic",
+ "licenseId": "CC-BY-NC-ND-2.5",
"seeAlso": [
- "http://www.sendmail.com/pdfs/open_source/sendmail_license.pdf",
- "https://web.archive.org/web/20160322142305/https://www.sendmail.com/pdfs/open_source/sendmail_license.pdf"
+ "https://creativecommons.org/licenses/by-nc-nd/2.5/legalcode"
],
"isOsiApproved": false
},
@@ -1502,16 +1502,18 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-NC-ND-2.5.html",
+ "reference": "https://spdx.org/licenses/LPL-1.02.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-ND-2.5.json",
+ "detailsUrl": "https://spdx.org/licenses/LPL-1.02.json",
"referenceNumber": 121,
- "name": "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic",
- "licenseId": "CC-BY-NC-ND-2.5",
+ "name": "Lucent Public License v1.02",
+ "licenseId": "LPL-1.02",
"seeAlso": [
- "https://creativecommons.org/licenses/by-nc-nd/2.5/legalcode"
+ "http://plan9.bell-labs.com/plan9/license.html",
+ "https://opensource.org/licenses/LPL-1.02"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/ECL-1.0.html",
@@ -1526,14 +1528,14 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Afmparse.html",
+ "reference": "https://spdx.org/licenses/OFL-1.0-no-RFN.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Afmparse.json",
+ "detailsUrl": "https://spdx.org/licenses/OFL-1.0-no-RFN.json",
"referenceNumber": 123,
- "name": "Afmparse License",
- "licenseId": "Afmparse",
+ "name": "SIL Open Font License 1.0 with no Reserved Font Name",
+ "licenseId": "OFL-1.0-no-RFN",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Afmparse"
+ "http://scripts.sil.org/cms/scripts/page.php?item_id\u003dOFL10_web"
],
"isOsiApproved": false
},
@@ -1588,41 +1590,40 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3-or-later.html",
+ "reference": "https://spdx.org/licenses/APSL-1.2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-or-later.json",
+ "detailsUrl": "https://spdx.org/licenses/APSL-1.2.json",
"referenceNumber": 128,
- "name": "GNU Free Documentation License v1.3 or later",
- "licenseId": "GFDL-1.3-or-later",
+ "name": "Apple Public Source License 1.2",
+ "licenseId": "APSL-1.2",
"seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
+ "http://www.samurajdata.se/opensource/mirror/licenses/apsl.php"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/LPL-1.02.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.2-no-invariants-only.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LPL-1.02.json",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.2-no-invariants-only.json",
"referenceNumber": 129,
- "name": "Lucent Public License v1.02",
- "licenseId": "LPL-1.02",
+ "name": "GNU Free Documentation License v1.2 only - no invariants",
+ "licenseId": "GFDL-1.2-no-invariants-only",
"seeAlso": [
- "http://plan9.bell-labs.com/plan9/license.html",
- "https://opensource.org/licenses/LPL-1.02"
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/AFL-2.0.html",
+ "reference": "https://spdx.org/licenses/Artistic-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/AFL-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/Artistic-2.0.json",
"referenceNumber": 130,
- "name": "Academic Free License v2.0",
- "licenseId": "AFL-2.0",
+ "name": "Artistic License 2.0",
+ "licenseId": "Artistic-2.0",
"seeAlso": [
- "http://wayback.archive.org/web/20060924134533/http://www.opensource.org/licenses/afl-2.0.txt"
+ "http://www.perlfoundation.org/artistic_license_2_0",
+ "https://www.perlfoundation.org/artistic-license-20.html",
+ "https://opensource.org/licenses/artistic-license-2.0"
],
"isOsiApproved": true,
"isFsfLibre": true
@@ -1642,30 +1643,27 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/Artistic-2.0.html",
+ "reference": "https://spdx.org/licenses/RSCPL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Artistic-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/RSCPL.json",
"referenceNumber": 132,
- "name": "Artistic License 2.0",
- "licenseId": "Artistic-2.0",
+ "name": "Ricoh Source Code Public License",
+ "licenseId": "RSCPL",
"seeAlso": [
- "http://www.perlfoundation.org/artistic_license_2_0",
- "https://www.perlfoundation.org/artistic-license-20.html",
- "https://opensource.org/licenses/artistic-license-2.0"
+ "http://wayback.archive.org/web/20060715140826/http://www.risource.org/RPL/RPL-1.0A.shtml",
+ "https://opensource.org/licenses/RSCPL"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/MS-RL.html",
+ "reference": "https://spdx.org/licenses/Sleepycat.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MS-RL.json",
+ "detailsUrl": "https://spdx.org/licenses/Sleepycat.json",
"referenceNumber": 133,
- "name": "Microsoft Reciprocal License",
- "licenseId": "MS-RL",
+ "name": "Sleepycat License",
+ "licenseId": "Sleepycat",
"seeAlso": [
- "http://www.microsoft.com/opensource/licenses.mspx",
- "https://opensource.org/licenses/MS-RL"
+ "https://opensource.org/licenses/Sleepycat"
],
"isOsiApproved": true,
"isFsfLibre": true
@@ -1683,14 +1681,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.2-no-invariants-only.html",
+ "reference": "https://spdx.org/licenses/CDLA-Sharing-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.2-no-invariants-only.json",
+ "detailsUrl": "https://spdx.org/licenses/CDLA-Sharing-1.0.json",
"referenceNumber": 135,
- "name": "GNU Free Documentation License v1.2 only - no invariants",
- "licenseId": "GFDL-1.2-no-invariants-only",
+ "name": "Community Data License Agreement Sharing 1.0",
+ "licenseId": "CDLA-Sharing-1.0",
"seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt"
+ "https://cdla.io/sharing-1-0"
],
"isOsiApproved": false
},
@@ -1709,14 +1707,14 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/HaskellReport.html",
+ "reference": "https://spdx.org/licenses/AGPL-1.0-only.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/HaskellReport.json",
+ "detailsUrl": "https://spdx.org/licenses/AGPL-1.0-only.json",
"referenceNumber": 137,
- "name": "Haskell Language Report License",
- "licenseId": "HaskellReport",
+ "name": "Affero General Public License v1.0 only",
+ "licenseId": "AGPL-1.0-only",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Haskell_Language_Report_License"
+ "http://www.affero.org/oagpl.html"
],
"isOsiApproved": false
},
@@ -1733,17 +1731,17 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/RSCPL.html",
+ "reference": "https://spdx.org/licenses/AFL-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/RSCPL.json",
+ "detailsUrl": "https://spdx.org/licenses/AFL-2.0.json",
"referenceNumber": 139,
- "name": "Ricoh Source Code Public License",
- "licenseId": "RSCPL",
+ "name": "Academic Free License v2.0",
+ "licenseId": "AFL-2.0",
"seeAlso": [
- "http://wayback.archive.org/web/20060715140826/http://www.risource.org/RPL/RPL-1.0A.shtml",
- "https://opensource.org/licenses/RSCPL"
+ "http://wayback.archive.org/web/20060924134533/http://www.opensource.org/licenses/afl-2.0.txt"
],
- "isOsiApproved": true
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/Intel.html",
@@ -1810,28 +1808,28 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/HTMLTIDY.html",
+ "reference": "https://spdx.org/licenses/Naumen.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/HTMLTIDY.json",
+ "detailsUrl": "https://spdx.org/licenses/Naumen.json",
"referenceNumber": 145,
- "name": "HTML Tidy License",
- "licenseId": "HTMLTIDY",
+ "name": "Naumen Public License",
+ "licenseId": "Naumen",
"seeAlso": [
- "https://github.com/htacg/tidy-html5/blob/next/README/LICENSE.md"
+ "https://opensource.org/licenses/Naumen"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Naumen.html",
+ "reference": "https://spdx.org/licenses/HTMLTIDY.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Naumen.json",
+ "detailsUrl": "https://spdx.org/licenses/HTMLTIDY.json",
"referenceNumber": 146,
- "name": "Naumen Public License",
- "licenseId": "Naumen",
+ "name": "HTML Tidy License",
+ "licenseId": "HTMLTIDY",
"seeAlso": [
- "https://opensource.org/licenses/Naumen"
+ "https://github.com/htacg/tidy-html5/blob/next/README/LICENSE.md"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/OLDAP-2.8.html",
@@ -1859,16 +1857,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LGPL-2.0-or-later.html",
+ "reference": "https://spdx.org/licenses/CC-BY-ND-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LGPL-2.0-or-later.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-2.0.json",
"referenceNumber": 149,
- "name": "GNU Library General Public License v2 or later",
- "licenseId": "LGPL-2.0-or-later",
+ "name": "Creative Commons Attribution No Derivatives 2.0 Generic",
+ "licenseId": "CC-BY-ND-2.0",
"seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html"
+ "https://creativecommons.org/licenses/by-nd/2.0/legalcode"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/OGTSL.html",
@@ -1884,16 +1882,16 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-ND-2.0.html",
+ "reference": "https://spdx.org/licenses/LGPL-2.0-or-later.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/LGPL-2.0-or-later.json",
"referenceNumber": 151,
- "name": "Creative Commons Attribution No Derivatives 2.0 Generic",
- "licenseId": "CC-BY-ND-2.0",
+ "name": "GNU Library General Public License v2 or later",
+ "licenseId": "LGPL-2.0-or-later",
"seeAlso": [
- "https://creativecommons.org/licenses/by-nd/2.0/legalcode"
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/Parity-7.0.0.html",
@@ -1908,26 +1906,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-NC-SA-4.0.html",
+ "reference": "https://spdx.org/licenses/CC-BY-ND-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-4.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-1.0.json",
"referenceNumber": 153,
- "name": "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
- "licenseId": "CC-BY-NC-SA-4.0",
+ "name": "Creative Commons Attribution No Derivatives 1.0 Generic",
+ "licenseId": "CC-BY-ND-1.0",
"seeAlso": [
- "https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode"
+ "https://creativecommons.org/licenses/by-nd/1.0/legalcode"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-ND-1.0.html",
+ "reference": "https://spdx.org/licenses/dvipdfm.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-ND-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/dvipdfm.json",
"referenceNumber": 154,
- "name": "Creative Commons Attribution No Derivatives 1.0 Generic",
- "licenseId": "CC-BY-ND-1.0",
+ "name": "dvipdfm License",
+ "licenseId": "dvipdfm",
"seeAlso": [
- "https://creativecommons.org/licenses/by-nd/1.0/legalcode"
+ "https://fedoraproject.org/wiki/Licensing/dvipdfm"
],
"isOsiApproved": false
},
@@ -1944,64 +1942,64 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/dvipdfm.html",
+ "reference": "https://spdx.org/licenses/BSD-4-Clause-UC.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/dvipdfm.json",
+ "detailsUrl": "https://spdx.org/licenses/BSD-4-Clause-UC.json",
"referenceNumber": 156,
- "name": "dvipdfm License",
- "licenseId": "dvipdfm",
+ "name": "BSD-4-Clause (University of California-Specific)",
+ "licenseId": "BSD-4-Clause-UC",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/dvipdfm"
+ "http://www.freebsd.org/copyright/license.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LGPL-3.0.html",
- "isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/LGPL-3.0.json",
+ "reference": "https://spdx.org/licenses/NLOD-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/NLOD-1.0.json",
"referenceNumber": 157,
- "name": "GNU Lesser General Public License v3.0 only",
- "licenseId": "LGPL-3.0",
+ "name": "Norwegian Licence for Open Government Data (NLOD) 1.0",
+ "licenseId": "NLOD-1.0",
"seeAlso": [
- "https://www.gnu.org/licenses/lgpl-3.0-standalone.html",
- "https://opensource.org/licenses/LGPL-3.0"
+ "http://data.norge.no/nlod/en/1.0"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OLDAP-2.5.html",
+ "reference": "https://spdx.org/licenses/MS-RL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OLDAP-2.5.json",
+ "detailsUrl": "https://spdx.org/licenses/MS-RL.json",
"referenceNumber": 158,
- "name": "Open LDAP Public License v2.5",
- "licenseId": "OLDAP-2.5",
+ "name": "Microsoft Reciprocal License",
+ "licenseId": "MS-RL",
"seeAlso": [
- "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003d6852b9d90022e8593c98205413380536b1b5a7cf"
+ "http://www.microsoft.com/opensource/licenses.mspx",
+ "https://opensource.org/licenses/MS-RL"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/NLOD-1.0.html",
+ "reference": "https://spdx.org/licenses/CC-BY-NC-SA-4.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NLOD-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-4.0.json",
"referenceNumber": 159,
- "name": "Norwegian Licence for Open Government Data (NLOD) 1.0",
- "licenseId": "NLOD-1.0",
+ "name": "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
+ "licenseId": "CC-BY-NC-SA-4.0",
"seeAlso": [
- "http://data.norge.no/nlod/en/1.0"
+ "https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/SMPPL.html",
+ "reference": "https://spdx.org/licenses/HaskellReport.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SMPPL.json",
+ "detailsUrl": "https://spdx.org/licenses/HaskellReport.json",
"referenceNumber": 160,
- "name": "Secure Messaging Protocol Public License",
- "licenseId": "SMPPL",
+ "name": "Haskell Language Report License",
+ "licenseId": "HaskellReport",
"seeAlso": [
- "https://github.com/dcblake/SMP/blob/master/Documentation/License.txt"
+ "https://fedoraproject.org/wiki/Licensing/Haskell_Language_Report_License"
],
"isOsiApproved": false
},
@@ -2042,28 +2040,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LGPL-2.1-only.html",
+ "reference": "https://spdx.org/licenses/SMPPL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LGPL-2.1-only.json",
+ "detailsUrl": "https://spdx.org/licenses/SMPPL.json",
"referenceNumber": 164,
- "name": "GNU Lesser General Public License v2.1 only",
- "licenseId": "LGPL-2.1-only",
- "seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
- "https://opensource.org/licenses/LGPL-2.1"
- ],
- "isOsiApproved": true,
- "isFsfLibre": true
- },
- {
- "reference": "https://spdx.org/licenses/GL2PS.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GL2PS.json",
- "referenceNumber": 165,
- "name": "GL2PS License",
- "licenseId": "GL2PS",
+ "name": "Secure Messaging Protocol Public License",
+ "licenseId": "SMPPL",
"seeAlso": [
- "http://www.geuz.org/gl2ps/COPYING.GL2PS"
+ "https://github.com/dcblake/SMP/blob/master/Documentation/License.txt"
],
"isOsiApproved": false
},
@@ -2071,7 +2055,7 @@
"reference": "https://spdx.org/licenses/PHP-3.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/PHP-3.0.json",
- "referenceNumber": 166,
+ "referenceNumber": 165,
"name": "PHP License v3.0",
"licenseId": "PHP-3.0",
"seeAlso": [
@@ -2081,15 +2065,26 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/NIST-PD-fallback.html",
+ "reference": "https://spdx.org/licenses/GL2PS.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NIST-PD-fallback.json",
+ "detailsUrl": "https://spdx.org/licenses/GL2PS.json",
+ "referenceNumber": 166,
+ "name": "GL2PS License",
+ "licenseId": "GL2PS",
+ "seeAlso": [
+ "http://www.geuz.org/gl2ps/COPYING.GL2PS"
+ ],
+ "isOsiApproved": false
+ },
+ {
+ "reference": "https://spdx.org/licenses/CrystalStacker.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CrystalStacker.json",
"referenceNumber": 167,
- "name": "NIST Public Domain Notice with license fallback",
- "licenseId": "NIST-PD-fallback",
+ "name": "CrystalStacker License",
+ "licenseId": "CrystalStacker",
"seeAlso": [
- "https://github.com/usnistgov/jsip/blob/59700e6926cbe96c5cdae897d9a7d2656b42abe3/LICENSE",
- "https://github.com/usnistgov/fipy/blob/86aaa5c2ba2c6f1be19593c5986071cf6568cc34/LICENSE.rst"
+ "https://fedoraproject.org/wiki/Licensing:CrystalStacker?rd\u003dLicensing/CrystalStacker"
],
"isOsiApproved": false
},
@@ -2106,17 +2101,17 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CPL-1.0.html",
+ "reference": "https://spdx.org/licenses/NIST-PD-fallback.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CPL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/NIST-PD-fallback.json",
"referenceNumber": 169,
- "name": "Common Public License 1.0",
- "licenseId": "CPL-1.0",
+ "name": "NIST Public Domain Notice with license fallback",
+ "licenseId": "NIST-PD-fallback",
"seeAlso": [
- "https://opensource.org/licenses/CPL-1.0"
+ "https://github.com/usnistgov/jsip/blob/59700e6926cbe96c5cdae897d9a7d2656b42abe3/LICENSE",
+ "https://github.com/usnistgov/fipy/blob/86aaa5c2ba2c6f1be19593c5986071cf6568cc34/LICENSE.rst"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/OGL-UK-1.0.html",
@@ -2131,29 +2126,31 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CrystalStacker.html",
+ "reference": "https://spdx.org/licenses/CPL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CrystalStacker.json",
+ "detailsUrl": "https://spdx.org/licenses/CPL-1.0.json",
"referenceNumber": 171,
- "name": "CrystalStacker License",
- "licenseId": "CrystalStacker",
+ "name": "Common Public License 1.0",
+ "licenseId": "CPL-1.0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing:CrystalStacker?rd\u003dLicensing/CrystalStacker"
+ "https://opensource.org/licenses/CPL-1.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/TCL.html",
+ "reference": "https://spdx.org/licenses/LGPL-2.1-only.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/TCL.json",
+ "detailsUrl": "https://spdx.org/licenses/LGPL-2.1-only.json",
"referenceNumber": 172,
- "name": "TCL/TK License",
- "licenseId": "TCL",
+ "name": "GNU Lesser General Public License v2.1 only",
+ "licenseId": "LGPL-2.1-only",
"seeAlso": [
- "http://www.tcl.tk/software/tcltk/license.html",
- "https://fedoraproject.org/wiki/Licensing/TCL"
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
+ "https://opensource.org/licenses/LGPL-2.1"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/ZPL-2.0.html",
@@ -2208,22 +2205,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LGPL-2.0.html",
- "isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/LGPL-2.0.json",
- "referenceNumber": 177,
- "name": "GNU Library General Public License v2 only",
- "licenseId": "LGPL-2.0",
- "seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html"
- ],
- "isOsiApproved": true
- },
- {
"reference": "https://spdx.org/licenses/EFL-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EFL-2.0.json",
- "referenceNumber": 178,
+ "referenceNumber": 177,
"name": "Eiffel Forum License v2.0",
"licenseId": "EFL-2.0",
"seeAlso": [
@@ -2234,6 +2219,18 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/Spencer-99.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/Spencer-99.json",
+ "referenceNumber": 178,
+ "name": "Spencer License 99",
+ "licenseId": "Spencer-99",
+ "seeAlso": [
+ "http://www.opensource.apple.com/source/tcl/tcl-5/tcl/generic/regfronts.c"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/CAL-1.0-Combined-Work-Exception.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CAL-1.0-Combined-Work-Exception.json",
@@ -2259,14 +2256,15 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/psutils.html",
+ "reference": "https://spdx.org/licenses/TCL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/psutils.json",
+ "detailsUrl": "https://spdx.org/licenses/TCL.json",
"referenceNumber": 181,
- "name": "psutils License",
- "licenseId": "psutils",
+ "name": "TCL/TK License",
+ "licenseId": "TCL",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/psutils"
+ "http://www.tcl.tk/software/tcltk/license.html",
+ "https://fedoraproject.org/wiki/Licensing/TCL"
],
"isOsiApproved": false
},
@@ -2295,62 +2293,62 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CERN-OHL-W-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CERN-OHL-W-2.0.json",
+ "reference": "https://spdx.org/licenses/LGPL-2.0.html",
+ "isDeprecatedLicenseId": true,
+ "detailsUrl": "https://spdx.org/licenses/LGPL-2.0.json",
"referenceNumber": 184,
- "name": "CERN Open Hardware Licence Version 2 - Weakly Reciprocal",
- "licenseId": "CERN-OHL-W-2.0",
+ "name": "GNU Library General Public License v2 only",
+ "licenseId": "LGPL-2.0",
"seeAlso": [
- "https://www.ohwr.org/project/cernohl/wikis/Documents/CERN-OHL-version-2"
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html"
],
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/NRL.html",
+ "reference": "https://spdx.org/licenses/CERN-OHL-W-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NRL.json",
+ "detailsUrl": "https://spdx.org/licenses/CERN-OHL-W-2.0.json",
"referenceNumber": 185,
- "name": "NRL License",
- "licenseId": "NRL",
+ "name": "CERN Open Hardware Licence Version 2 - Weakly Reciprocal",
+ "licenseId": "CERN-OHL-W-2.0",
"seeAlso": [
- "http://web.mit.edu/network/isakmp/nrllicense.html"
+ "https://www.ohwr.org/project/cernohl/wikis/Documents/CERN-OHL-version-2"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/CECILL-2.1.html",
+ "reference": "https://spdx.org/licenses/Glide.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CECILL-2.1.json",
+ "detailsUrl": "https://spdx.org/licenses/Glide.json",
"referenceNumber": 186,
- "name": "CeCILL Free Software License Agreement v2.1",
- "licenseId": "CECILL-2.1",
+ "name": "3dfx Glide License",
+ "licenseId": "Glide",
"seeAlso": [
- "http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html"
+ "http://www.users.on.net/~triforce/glidexp/COPYING.txt"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Glide.html",
+ "reference": "https://spdx.org/licenses/mpich2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Glide.json",
+ "detailsUrl": "https://spdx.org/licenses/mpich2.json",
"referenceNumber": 187,
- "name": "3dfx Glide License",
- "licenseId": "Glide",
+ "name": "mpich2 License",
+ "licenseId": "mpich2",
"seeAlso": [
- "http://www.users.on.net/~triforce/glidexp/COPYING.txt"
+ "https://fedoraproject.org/wiki/Licensing/MIT"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/SCEA.html",
+ "reference": "https://spdx.org/licenses/psutils.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SCEA.json",
+ "detailsUrl": "https://spdx.org/licenses/psutils.json",
"referenceNumber": 188,
- "name": "SCEA Shared Source License",
- "licenseId": "SCEA",
+ "name": "psutils License",
+ "licenseId": "psutils",
"seeAlso": [
- "http://research.scea.com/scea_shared_source_license.html"
+ "https://fedoraproject.org/wiki/Licensing/psutils"
],
"isOsiApproved": false
},
@@ -2394,52 +2392,52 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/SWL.html",
+ "reference": "https://spdx.org/licenses/FreeBSD-DOC.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SWL.json",
+ "detailsUrl": "https://spdx.org/licenses/FreeBSD-DOC.json",
"referenceNumber": 192,
- "name": "Scheme Widget Library (SWL) Software License Agreement",
- "licenseId": "SWL",
+ "name": "FreeBSD Documentation License",
+ "licenseId": "FreeBSD-DOC",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/SWL"
+ "https://www.freebsd.org/copyright/freebsd-doc-license/"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/mpich2.html",
+ "reference": "https://spdx.org/licenses/SCEA.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/mpich2.json",
+ "detailsUrl": "https://spdx.org/licenses/SCEA.json",
"referenceNumber": 193,
- "name": "mpich2 License",
- "licenseId": "mpich2",
+ "name": "SCEA Shared Source License",
+ "licenseId": "SCEA",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/MIT"
+ "http://research.scea.com/scea_shared_source_license.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CERN-OHL-1.1.html",
+ "reference": "https://spdx.org/licenses/Latex2e.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CERN-OHL-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/Latex2e.json",
"referenceNumber": 194,
- "name": "CERN Open Hardware Licence v1.1",
- "licenseId": "CERN-OHL-1.1",
+ "name": "Latex2e License",
+ "licenseId": "Latex2e",
"seeAlso": [
- "https://www.ohwr.org/project/licenses/wikis/cern-ohl-v1.1"
+ "https://fedoraproject.org/wiki/Licensing/Latex2e"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Latex2e.html",
+ "reference": "https://spdx.org/licenses/Artistic-1.0-cl8.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Latex2e.json",
+ "detailsUrl": "https://spdx.org/licenses/Artistic-1.0-cl8.json",
"referenceNumber": 195,
- "name": "Latex2e License",
- "licenseId": "Latex2e",
+ "name": "Artistic License 1.0 w/clause 8",
+ "licenseId": "Artistic-1.0-cl8",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Latex2e"
+ "https://opensource.org/licenses/Artistic-1.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/SGI-B-1.1.html",
@@ -2454,28 +2452,28 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/FreeBSD-DOC.html",
+ "reference": "https://spdx.org/licenses/NRL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/FreeBSD-DOC.json",
+ "detailsUrl": "https://spdx.org/licenses/NRL.json",
"referenceNumber": 197,
- "name": "FreeBSD Documentation License",
- "licenseId": "FreeBSD-DOC",
+ "name": "NRL License",
+ "licenseId": "NRL",
"seeAlso": [
- "https://www.freebsd.org/copyright/freebsd-doc-license/"
+ "http://web.mit.edu/network/isakmp/nrllicense.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Artistic-1.0-cl8.html",
+ "reference": "https://spdx.org/licenses/SWL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Artistic-1.0-cl8.json",
+ "detailsUrl": "https://spdx.org/licenses/SWL.json",
"referenceNumber": 198,
- "name": "Artistic License 1.0 w/clause 8",
- "licenseId": "Artistic-1.0-cl8",
+ "name": "Scheme Widget Library (SWL) Software License Agreement",
+ "licenseId": "SWL",
"seeAlso": [
- "https://opensource.org/licenses/Artistic-1.0"
+ "https://fedoraproject.org/wiki/Licensing/SWL"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/Zed.html",
@@ -2490,26 +2488,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/RHeCos-1.1.html",
+ "reference": "https://spdx.org/licenses/CERN-OHL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/RHeCos-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/CERN-OHL-1.1.json",
"referenceNumber": 200,
- "name": "Red Hat eCos Public License v1.1",
- "licenseId": "RHeCos-1.1",
+ "name": "CERN Open Hardware Licence v1.1",
+ "licenseId": "CERN-OHL-1.1",
"seeAlso": [
- "http://ecos.sourceware.org/old-license.html"
+ "https://www.ohwr.org/project/licenses/wikis/cern-ohl-v1.1"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/SSPL-1.0.html",
+ "reference": "https://spdx.org/licenses/RHeCos-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SSPL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/RHeCos-1.1.json",
"referenceNumber": 201,
- "name": "Server Side Public License, v 1",
- "licenseId": "SSPL-1.0",
+ "name": "Red Hat eCos Public License v1.1",
+ "licenseId": "RHeCos-1.1",
"seeAlso": [
- "https://www.mongodb.com/licensing/server-side-public-license"
+ "http://ecos.sourceware.org/old-license.html"
],
"isOsiApproved": false
},
@@ -2526,10 +2524,22 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/SSPL-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/SSPL-1.0.json",
+ "referenceNumber": 203,
+ "name": "Server Side Public License, v 1",
+ "licenseId": "SSPL-1.0",
+ "seeAlso": [
+ "https://www.mongodb.com/licensing/server-side-public-license"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/GPL-2.0+.html",
"isDeprecatedLicenseId": true,
"detailsUrl": "https://spdx.org/licenses/GPL-2.0+.json",
- "referenceNumber": 203,
+ "referenceNumber": 204,
"name": "GNU General Public License v2.0 or later",
"licenseId": "GPL-2.0+",
"seeAlso": [
@@ -2542,7 +2552,7 @@
"reference": "https://spdx.org/licenses/OLDAP-1.4.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OLDAP-1.4.json",
- "referenceNumber": 204,
+ "referenceNumber": 205,
"name": "Open LDAP Public License v1.4",
"licenseId": "OLDAP-1.4",
"seeAlso": [
@@ -2554,7 +2564,7 @@
"reference": "https://spdx.org/licenses/libpng-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/libpng-2.0.json",
- "referenceNumber": 205,
+ "referenceNumber": 206,
"name": "PNG Reference Library version 2",
"licenseId": "libpng-2.0",
"seeAlso": [
@@ -2566,7 +2576,7 @@
"reference": "https://spdx.org/licenses/CNRI-Python-GPL-Compatible.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CNRI-Python-GPL-Compatible.json",
- "referenceNumber": 206,
+ "referenceNumber": 207,
"name": "CNRI Python Open Source GPL Compatible License Agreement",
"licenseId": "CNRI-Python-GPL-Compatible",
"seeAlso": [
@@ -2575,18 +2585,6 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-2.0.json",
- "referenceNumber": 207,
- "name": "Creative Commons Attribution 2.0 Generic",
- "licenseId": "CC-BY-2.0",
- "seeAlso": [
- "https://creativecommons.org/licenses/by/2.0/legalcode"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/Aladdin.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Aladdin.json",
@@ -2599,17 +2597,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Sleepycat.html",
+ "reference": "https://spdx.org/licenses/CECILL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Sleepycat.json",
+ "detailsUrl": "https://spdx.org/licenses/CECILL-1.0.json",
"referenceNumber": 209,
- "name": "Sleepycat License",
- "licenseId": "Sleepycat",
+ "name": "CeCILL Free Software License Agreement v1.0",
+ "licenseId": "CECILL-1.0",
"seeAlso": [
- "https://opensource.org/licenses/Sleepycat"
+ "http://www.cecill.info/licences/Licence_CeCILL_V1-fr.html"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/Ruby.html",
@@ -2625,10 +2622,23 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/NPL-1.1.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/NPL-1.1.json",
+ "referenceNumber": 211,
+ "name": "Netscape Public License v1.1",
+ "licenseId": "NPL-1.1",
+ "seeAlso": [
+ "http://www.mozilla.org/MPL/NPL/1.1/"
+ ],
+ "isOsiApproved": false,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/ImageMagick.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/ImageMagick.json",
- "referenceNumber": 211,
+ "referenceNumber": 212,
"name": "ImageMagick License",
"licenseId": "ImageMagick",
"seeAlso": [
@@ -2637,14 +2647,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CECILL-1.0.html",
+ "reference": "https://spdx.org/licenses/Cube.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CECILL-1.0.json",
- "referenceNumber": 212,
- "name": "CeCILL Free Software License Agreement v1.0",
- "licenseId": "CECILL-1.0",
+ "detailsUrl": "https://spdx.org/licenses/Cube.json",
+ "referenceNumber": 213,
+ "name": "Cube License",
+ "licenseId": "Cube",
"seeAlso": [
- "http://www.cecill.info/licences/Licence_CeCILL_V1-fr.html"
+ "https://fedoraproject.org/wiki/Licensing/Cube"
],
"isOsiApproved": false
},
@@ -2652,7 +2662,7 @@
"reference": "https://spdx.org/licenses/GFDL-1.1-only.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/GFDL-1.1-only.json",
- "referenceNumber": 213,
+ "referenceNumber": 214,
"name": "GNU Free Documentation License v1.1 only",
"licenseId": "GFDL-1.1-only",
"seeAlso": [
@@ -2662,41 +2672,30 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/NPL-1.1.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NPL-1.1.json",
- "referenceNumber": 214,
- "name": "Netscape Public License v1.1",
- "licenseId": "NPL-1.1",
- "seeAlso": [
- "http://www.mozilla.org/MPL/NPL/1.1/"
- ],
- "isOsiApproved": false,
- "isFsfLibre": true
- },
- {
- "reference": "https://spdx.org/licenses/TU-Berlin-2.0.html",
+ "reference": "https://spdx.org/licenses/CC-BY-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/TU-Berlin-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-2.0.json",
"referenceNumber": 215,
- "name": "Technische Universitaet Berlin License 2.0",
- "licenseId": "TU-Berlin-2.0",
+ "name": "Creative Commons Attribution 2.0 Generic",
+ "licenseId": "CC-BY-2.0",
"seeAlso": [
- "https://github.com/CorsixTH/deps/blob/fd339a9f526d1d9c9f01ccf39e438a015da50035/licences/libgsm.txt"
+ "https://creativecommons.org/licenses/by/2.0/legalcode"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Cube.html",
+ "reference": "https://spdx.org/licenses/AFL-1.2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Cube.json",
+ "detailsUrl": "https://spdx.org/licenses/AFL-1.2.json",
"referenceNumber": 216,
- "name": "Cube License",
- "licenseId": "Cube",
+ "name": "Academic Free License v1.2",
+ "licenseId": "AFL-1.2",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Cube"
+ "http://opensource.linux-mirror.org/licenses/afl-1.2.txt",
+ "http://wayback.archive.org/web/20021204204652/http://www.opensource.org/licenses/academic.php"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/CC-BY-SA-2.0.html",
@@ -2711,22 +2710,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/MIT-advertising.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MIT-advertising.json",
- "referenceNumber": 218,
- "name": "Enlightenment License (e16)",
- "licenseId": "MIT-advertising",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/MIT_With_Advertising"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/CECILL-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CECILL-2.0.json",
- "referenceNumber": 219,
+ "referenceNumber": 218,
"name": "CeCILL Free Software License Agreement v2.0",
"licenseId": "CECILL-2.0",
"seeAlso": [
@@ -2736,6 +2723,18 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/MIT-advertising.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/MIT-advertising.json",
+ "referenceNumber": 219,
+ "name": "Enlightenment License (e16)",
+ "licenseId": "MIT-advertising",
+ "seeAlso": [
+ "https://fedoraproject.org/wiki/Licensing/MIT_With_Advertising"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/CC-BY-NC-SA-2.5.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-2.5.json",
@@ -2760,15 +2759,15 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/AFL-1.2.html",
+ "reference": "https://spdx.org/licenses/OSL-3.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/AFL-1.2.json",
+ "detailsUrl": "https://spdx.org/licenses/OSL-3.0.json",
"referenceNumber": 222,
- "name": "Academic Free License v1.2",
- "licenseId": "AFL-1.2",
+ "name": "Open Software License 3.0",
+ "licenseId": "OSL-3.0",
"seeAlso": [
- "http://opensource.linux-mirror.org/licenses/afl-1.2.txt",
- "http://wayback.archive.org/web/20021204204652/http://www.opensource.org/licenses/academic.php"
+ "https://web.archive.org/web/20120101081418/http://rosenlaw.com:80/OSL3.0.htm",
+ "https://opensource.org/licenses/OSL-3.0"
],
"isOsiApproved": true,
"isFsfLibre": true
@@ -2811,24 +2810,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OSL-3.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OSL-3.0.json",
- "referenceNumber": 226,
- "name": "Open Software License 3.0",
- "licenseId": "OSL-3.0",
- "seeAlso": [
- "https://web.archive.org/web/20120101081418/http://rosenlaw.com:80/OSL3.0.htm",
- "https://opensource.org/licenses/OSL-3.0"
- ],
- "isOsiApproved": true,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/EUDatagrid.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EUDatagrid.json",
- "referenceNumber": 227,
+ "referenceNumber": 226,
"name": "EU DataGrid Software License",
"licenseId": "EUDatagrid",
"seeAlso": [
@@ -2842,7 +2827,7 @@
"reference": "https://spdx.org/licenses/MTLL.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MTLL.json",
- "referenceNumber": 228,
+ "referenceNumber": 227,
"name": "Matrix Template Library License",
"licenseId": "MTLL",
"seeAlso": [
@@ -2854,7 +2839,7 @@
"reference": "https://spdx.org/licenses/GFDL-1.2-invariants-only.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/GFDL-1.2-invariants-only.json",
- "referenceNumber": 229,
+ "referenceNumber": 228,
"name": "GNU Free Documentation License v1.2 only - invariants",
"licenseId": "GFDL-1.2-invariants-only",
"seeAlso": [
@@ -2863,6 +2848,18 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/GFDL-1.3-no-invariants-or-later.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-no-invariants-or-later.json",
+ "referenceNumber": 229,
+ "name": "GNU Free Documentation License v1.3 or later - no invariants",
+ "licenseId": "GFDL-1.3-no-invariants-or-later",
+ "seeAlso": [
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/curl.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/curl.json",
@@ -2875,14 +2872,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-3.0.html",
+ "reference": "https://spdx.org/licenses/LAL-1.3.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-3.0.json",
+ "detailsUrl": "https://spdx.org/licenses/LAL-1.3.json",
"referenceNumber": 231,
- "name": "Creative Commons Attribution 3.0 Unported",
- "licenseId": "CC-BY-3.0",
+ "name": "Licence Art Libre 1.3",
+ "licenseId": "LAL-1.3",
"seeAlso": [
- "https://creativecommons.org/licenses/by/3.0/legalcode"
+ "https://artlibre.org/"
],
"isOsiApproved": false
},
@@ -2899,26 +2896,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LAL-1.3.html",
+ "reference": "https://spdx.org/licenses/CERN-OHL-1.2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LAL-1.3.json",
+ "detailsUrl": "https://spdx.org/licenses/CERN-OHL-1.2.json",
"referenceNumber": 233,
- "name": "Licence Art Libre 1.3",
- "licenseId": "LAL-1.3",
+ "name": "CERN Open Hardware Licence v1.2",
+ "licenseId": "CERN-OHL-1.2",
"seeAlso": [
- "https://artlibre.org/"
+ "https://www.ohwr.org/project/licenses/wikis/cern-ohl-v1.2"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CERN-OHL-1.2.html",
+ "reference": "https://spdx.org/licenses/TOSL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CERN-OHL-1.2.json",
+ "detailsUrl": "https://spdx.org/licenses/TOSL.json",
"referenceNumber": 234,
- "name": "CERN Open Hardware Licence v1.2",
- "licenseId": "CERN-OHL-1.2",
+ "name": "Trusster Open Source License",
+ "licenseId": "TOSL",
"seeAlso": [
- "https://www.ohwr.org/project/licenses/wikis/cern-ohl-v1.2"
+ "https://fedoraproject.org/wiki/Licensing/TOSL"
],
"isOsiApproved": false
},
@@ -2935,38 +2932,38 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/TOSL.html",
+ "reference": "https://spdx.org/licenses/CC-BY-3.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/TOSL.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-3.0.json",
"referenceNumber": 236,
- "name": "Trusster Open Source License",
- "licenseId": "TOSL",
+ "name": "Creative Commons Attribution 3.0 Unported",
+ "licenseId": "CC-BY-3.0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/TOSL"
+ "https://creativecommons.org/licenses/by/3.0/legalcode"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3-no-invariants-only.html",
+ "reference": "https://spdx.org/licenses/Qhull.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-no-invariants-only.json",
+ "detailsUrl": "https://spdx.org/licenses/Qhull.json",
"referenceNumber": 237,
- "name": "GNU Free Documentation License v1.3 only - no invariants",
- "licenseId": "GFDL-1.3-no-invariants-only",
+ "name": "Qhull License",
+ "licenseId": "Qhull",
"seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
+ "https://fedoraproject.org/wiki/Licensing/Qhull"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Qhull.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.3-no-invariants-only.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Qhull.json",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-no-invariants-only.json",
"referenceNumber": 238,
- "name": "Qhull License",
- "licenseId": "Qhull",
+ "name": "GNU Free Documentation License v1.3 only - no invariants",
+ "licenseId": "GFDL-1.3-no-invariants-only",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Qhull"
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
],
"isOsiApproved": false
},
@@ -3073,28 +3070,29 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CDLA-Sharing-1.0.html",
+ "reference": "https://spdx.org/licenses/Xerox.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CDLA-Sharing-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/Xerox.json",
"referenceNumber": 247,
- "name": "Community Data License Agreement Sharing 1.0",
- "licenseId": "CDLA-Sharing-1.0",
+ "name": "Xerox License",
+ "licenseId": "Xerox",
"seeAlso": [
- "https://cdla.io/sharing-1-0"
+ "https://fedoraproject.org/wiki/Licensing/Xerox"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/AGPL-1.0-only.html",
+ "reference": "https://spdx.org/licenses/CDDL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/AGPL-1.0-only.json",
+ "detailsUrl": "https://spdx.org/licenses/CDDL-1.0.json",
"referenceNumber": 248,
- "name": "Affero General Public License v1.0 only",
- "licenseId": "AGPL-1.0-only",
+ "name": "Common Development and Distribution License 1.0",
+ "licenseId": "CDDL-1.0",
"seeAlso": [
- "http://www.affero.org/oagpl.html"
+ "https://opensource.org/licenses/cddl1"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/GFDL-1.3-invariants-only.html",
@@ -3109,14 +3107,15 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BSD-4-Clause-UC.html",
+ "reference": "https://spdx.org/licenses/etalab-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-4-Clause-UC.json",
+ "detailsUrl": "https://spdx.org/licenses/etalab-2.0.json",
"referenceNumber": 250,
- "name": "BSD-4-Clause (University of California-Specific)",
- "licenseId": "BSD-4-Clause-UC",
+ "name": "Etalab Open License 2.0",
+ "licenseId": "etalab-2.0",
"seeAlso": [
- "http://www.freebsd.org/copyright/license.html"
+ "https://github.com/DISIC/politique-de-contribution-open-source/blob/master/LICENSE.pdf",
+ "https://raw.githubusercontent.com/DISIC/politique-de-contribution-open-source/master/LICENSE"
],
"isOsiApproved": false
},
@@ -3146,14 +3145,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Spencer-99.html",
+ "reference": "https://spdx.org/licenses/LPPL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Spencer-99.json",
+ "detailsUrl": "https://spdx.org/licenses/LPPL-1.1.json",
"referenceNumber": 253,
- "name": "Spencer License 99",
- "licenseId": "Spencer-99",
+ "name": "LaTeX Project Public License v1.1",
+ "licenseId": "LPPL-1.1",
"seeAlso": [
- "http://www.opensource.apple.com/source/tcl/tcl-5/tcl/generic/regfronts.c"
+ "http://www.latex-project.org/lppl/lppl-1-1.txt"
],
"isOsiApproved": false
},
@@ -3170,53 +3169,39 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3-no-invariants-or-later.html",
+ "reference": "https://spdx.org/licenses/TU-Berlin-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-no-invariants-or-later.json",
+ "detailsUrl": "https://spdx.org/licenses/TU-Berlin-2.0.json",
"referenceNumber": 255,
- "name": "GNU Free Documentation License v1.3 or later - no invariants",
- "licenseId": "GFDL-1.3-no-invariants-or-later",
+ "name": "Technische Universitaet Berlin License 2.0",
+ "licenseId": "TU-Berlin-2.0",
"seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
+ "https://github.com/CorsixTH/deps/blob/fd339a9f526d1d9c9f01ccf39e438a015da50035/licences/libgsm.txt"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/LPPL-1.1.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/LPPL-1.1.json",
+ "reference": "https://spdx.org/licenses/GFDL-1.3.html",
+ "isDeprecatedLicenseId": true,
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3.json",
"referenceNumber": 256,
- "name": "LaTeX Project Public License v1.1",
- "licenseId": "LPPL-1.1",
- "seeAlso": [
- "http://www.latex-project.org/lppl/lppl-1-1.txt"
- ],
- "isOsiApproved": false
- },
- {
- "reference": "https://spdx.org/licenses/CDDL-1.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CDDL-1.0.json",
- "referenceNumber": 257,
- "name": "Common Development and Distribution License 1.0",
- "licenseId": "CDDL-1.0",
+ "name": "GNU Free Documentation License v1.3",
+ "licenseId": "GFDL-1.3",
"seeAlso": [
- "https://opensource.org/licenses/cddl1"
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
],
- "isOsiApproved": true,
+ "isOsiApproved": false,
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/FTL.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.3-or-later.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/FTL.json",
- "referenceNumber": 258,
- "name": "Freetype Project License",
- "licenseId": "FTL",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-or-later.json",
+ "referenceNumber": 257,
+ "name": "GNU Free Documentation License v1.3 or later",
+ "licenseId": "GFDL-1.3-or-later",
"seeAlso": [
- "http://freetype.fis.uniroma2.it/FTL.TXT",
- "http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT",
- "http://gitlab.freedesktop.org/freetype/freetype/-/raw/master/docs/FTL.TXT"
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
],
"isOsiApproved": false,
"isFsfLibre": true
@@ -3225,7 +3210,7 @@
"reference": "https://spdx.org/licenses/LAL-1.2.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/LAL-1.2.json",
- "referenceNumber": 259,
+ "referenceNumber": 258,
"name": "Licence Art Libre 1.2",
"licenseId": "LAL-1.2",
"seeAlso": [
@@ -3237,7 +3222,7 @@
"reference": "https://spdx.org/licenses/ICU.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/ICU.json",
- "referenceNumber": 260,
+ "referenceNumber": 259,
"name": "ICU License",
"licenseId": "ICU",
"seeAlso": [
@@ -3246,6 +3231,21 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/FTL.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/FTL.json",
+ "referenceNumber": 260,
+ "name": "Freetype Project License",
+ "licenseId": "FTL",
+ "seeAlso": [
+ "http://freetype.fis.uniroma2.it/FTL.TXT",
+ "http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT",
+ "http://gitlab.freedesktop.org/freetype/freetype/-/raw/master/docs/FTL.TXT"
+ ],
+ "isOsiApproved": false,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/MirOS.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MirOS.json",
@@ -3282,16 +3282,17 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Xerox.html",
+ "reference": "https://spdx.org/licenses/OSET-PL-2.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Xerox.json",
+ "detailsUrl": "https://spdx.org/licenses/OSET-PL-2.1.json",
"referenceNumber": 264,
- "name": "Xerox License",
- "licenseId": "Xerox",
+ "name": "OSET Public License version 2.1",
+ "licenseId": "OSET-PL-2.1",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Xerox"
+ "http://www.osetfoundation.org/public-license",
+ "https://opensource.org/licenses/OPL-2.1"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/CC-BY-NC-ND-2.0.html",
@@ -3306,39 +3307,38 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OSET-PL-2.1.html",
+ "reference": "https://spdx.org/licenses/SISSL-1.2.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OSET-PL-2.1.json",
+ "detailsUrl": "https://spdx.org/licenses/SISSL-1.2.json",
"referenceNumber": 266,
- "name": "OSET Public License version 2.1",
- "licenseId": "OSET-PL-2.1",
+ "name": "Sun Industry Standards Source License v1.2",
+ "licenseId": "SISSL-1.2",
"seeAlso": [
- "http://www.osetfoundation.org/public-license",
- "https://opensource.org/licenses/OPL-2.1"
+ "http://gridscheduler.sourceforge.net/Gridengine_SISSL_license.html"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/SISSL-1.2.html",
+ "reference": "https://spdx.org/licenses/Wsuipa.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SISSL-1.2.json",
+ "detailsUrl": "https://spdx.org/licenses/Wsuipa.json",
"referenceNumber": 267,
- "name": "Sun Industry Standards Source License v1.2",
- "licenseId": "SISSL-1.2",
+ "name": "Wsuipa License",
+ "licenseId": "Wsuipa",
"seeAlso": [
- "http://gridscheduler.sourceforge.net/Gridengine_SISSL_license.html"
+ "https://fedoraproject.org/wiki/Licensing/Wsuipa"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Adobe-Glyph.html",
+ "reference": "https://spdx.org/licenses/Zimbra-1.4.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Adobe-Glyph.json",
+ "detailsUrl": "https://spdx.org/licenses/Zimbra-1.4.json",
"referenceNumber": 268,
- "name": "Adobe Glyph List License",
- "licenseId": "Adobe-Glyph",
+ "name": "Zimbra Public License v1.4",
+ "licenseId": "Zimbra-1.4",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/MIT#AdobeGlyph"
+ "http://www.zimbra.com/legal/zimbra-public-license-1-4"
],
"isOsiApproved": false
},
@@ -3355,27 +3355,28 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/etalab-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/etalab-2.0.json",
+ "reference": "https://spdx.org/licenses/LGPL-3.0.html",
+ "isDeprecatedLicenseId": true,
+ "detailsUrl": "https://spdx.org/licenses/LGPL-3.0.json",
"referenceNumber": 270,
- "name": "Etalab Open License 2.0",
- "licenseId": "etalab-2.0",
+ "name": "GNU Lesser General Public License v3.0 only",
+ "licenseId": "LGPL-3.0",
"seeAlso": [
- "https://github.com/DISIC/politique-de-contribution-open-source/blob/master/LICENSE.pdf",
- "https://raw.githubusercontent.com/DISIC/politique-de-contribution-open-source/master/LICENSE"
+ "https://www.gnu.org/licenses/lgpl-3.0-standalone.html",
+ "https://opensource.org/licenses/LGPL-3.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/Wsuipa.html",
+ "reference": "https://spdx.org/licenses/OLDAP-2.5.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Wsuipa.json",
+ "detailsUrl": "https://spdx.org/licenses/OLDAP-2.5.json",
"referenceNumber": 271,
- "name": "Wsuipa License",
- "licenseId": "Wsuipa",
+ "name": "Open LDAP Public License v2.5",
+ "licenseId": "OLDAP-2.5",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Wsuipa"
+ "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003d6852b9d90022e8593c98205413380536b1b5a7cf"
],
"isOsiApproved": false
},
@@ -3416,10 +3417,22 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/Adobe-Glyph.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/Adobe-Glyph.json",
+ "referenceNumber": 275,
+ "name": "Adobe Glyph List License",
+ "licenseId": "Adobe-Glyph",
+ "seeAlso": [
+ "https://fedoraproject.org/wiki/Licensing/MIT#AdobeGlyph"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/0BSD.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/0BSD.json",
- "referenceNumber": 275,
+ "referenceNumber": 276,
"name": "BSD Zero Clause License",
"licenseId": "0BSD",
"seeAlso": [
@@ -3431,7 +3444,7 @@
"reference": "https://spdx.org/licenses/W3C-19980720.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/W3C-19980720.json",
- "referenceNumber": 276,
+ "referenceNumber": 277,
"name": "W3C Software Notice and License (1998-07-20)",
"licenseId": "W3C-19980720",
"seeAlso": [
@@ -3440,18 +3453,6 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CC-BY-NC-SA-3.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-3.0.json",
- "referenceNumber": 277,
- "name": "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported",
- "licenseId": "CC-BY-NC-SA-3.0",
- "seeAlso": [
- "https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/FSFUL.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/FSFUL.json",
@@ -3464,26 +3465,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.html",
+ "reference": "https://spdx.org/licenses/CC-BY-NC-SA-3.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-NC-SA-3.0.json",
"referenceNumber": 279,
- "name": "PolyForm Noncommercial License 1.0.0",
- "licenseId": "PolyForm-Noncommercial-1.0.0",
- "seeAlso": [
- "https://polyformproject.org/licenses/noncommercial/1.0.0"
- ],
- "isOsiApproved": false
- },
- {
- "reference": "https://spdx.org/licenses/Zimbra-1.4.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Zimbra-1.4.json",
- "referenceNumber": 280,
- "name": "Zimbra Public License v1.4",
- "licenseId": "Zimbra-1.4",
+ "name": "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported",
+ "licenseId": "CC-BY-NC-SA-3.0",
"seeAlso": [
- "http://www.zimbra.com/legal/zimbra-public-license-1-4"
+ "https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode"
],
"isOsiApproved": false
},
@@ -3491,7 +3480,7 @@
"reference": "https://spdx.org/licenses/DOC.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/DOC.json",
- "referenceNumber": 281,
+ "referenceNumber": 280,
"name": "DOC License",
"licenseId": "DOC",
"seeAlso": [
@@ -3504,7 +3493,7 @@
"reference": "https://spdx.org/licenses/TMate.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/TMate.json",
- "referenceNumber": 282,
+ "referenceNumber": 281,
"name": "TMate Open Source License",
"licenseId": "TMate",
"seeAlso": [
@@ -3513,6 +3502,21 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/MIT-open-group.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/MIT-open-group.json",
+ "referenceNumber": 282,
+ "name": "MIT Open Group variant",
+ "licenseId": "MIT-open-group",
+ "seeAlso": [
+ "https://gitlab.freedesktop.org/xorg/app/iceauth/-/blob/master/COPYING",
+ "https://gitlab.freedesktop.org/xorg/app/xvinfo/-/blob/master/COPYING",
+ "https://gitlab.freedesktop.org/xorg/app/xsetroot/-/blob/master/COPYING",
+ "https://gitlab.freedesktop.org/xorg/app/xauth/-/blob/master/COPYING"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/AMDPLPA.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/AMDPLPA.json",
@@ -3525,32 +3529,30 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/MIT-open-group.html",
+ "reference": "https://spdx.org/licenses/Condor-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MIT-open-group.json",
+ "detailsUrl": "https://spdx.org/licenses/Condor-1.1.json",
"referenceNumber": 284,
- "name": "MIT Open Group variant",
- "licenseId": "MIT-open-group",
+ "name": "Condor Public License v1.1",
+ "licenseId": "Condor-1.1",
"seeAlso": [
- "https://gitlab.freedesktop.org/xorg/app/iceauth/-/blob/master/COPYING",
- "https://gitlab.freedesktop.org/xorg/app/xvinfo/-/blob/master/COPYING",
- "https://gitlab.freedesktop.org/xorg/app/xsetroot/-/blob/master/COPYING",
- "https://gitlab.freedesktop.org/xorg/app/xauth/-/blob/master/COPYING"
+ "http://research.cs.wisc.edu/condor/license.html#condor",
+ "http://web.archive.org/web/20111123062036/http://research.cs.wisc.edu/condor/license.html#condor"
],
- "isOsiApproved": false
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-4.0.html",
+ "reference": "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-4.0.json",
+ "detailsUrl": "https://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.json",
"referenceNumber": 285,
- "name": "Creative Commons Attribution 4.0 International",
- "licenseId": "CC-BY-4.0",
+ "name": "PolyForm Noncommercial License 1.0.0",
+ "licenseId": "PolyForm-Noncommercial-1.0.0",
"seeAlso": [
- "https://creativecommons.org/licenses/by/4.0/legalcode"
+ "https://polyformproject.org/licenses/noncommercial/1.0.0"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/BSD-3-Clause-No-Military-License.html",
@@ -3566,15 +3568,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Condor-1.1.html",
+ "reference": "https://spdx.org/licenses/CC-BY-4.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Condor-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-4.0.json",
"referenceNumber": 287,
- "name": "Condor Public License v1.1",
- "licenseId": "Condor-1.1",
+ "name": "Creative Commons Attribution 4.0 International",
+ "licenseId": "CC-BY-4.0",
"seeAlso": [
- "http://research.cs.wisc.edu/condor/license.html#condor",
- "http://web.archive.org/web/20111123062036/http://research.cs.wisc.edu/condor/license.html#condor"
+ "https://creativecommons.org/licenses/by/4.0/legalcode"
],
"isOsiApproved": false,
"isFsfLibre": true
@@ -3641,23 +3642,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3.html",
- "isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3.json",
- "referenceNumber": 293,
- "name": "GNU Free Documentation License v1.3",
- "licenseId": "GFDL-1.3",
- "seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
- ],
- "isOsiApproved": false,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/GPL-3.0-or-later.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/GPL-3.0-or-later.json",
- "referenceNumber": 294,
+ "referenceNumber": 293,
"name": "GNU General Public License v3.0 or later",
"licenseId": "GPL-3.0-or-later",
"seeAlso": [
@@ -3671,7 +3659,7 @@
"reference": "https://spdx.org/licenses/CDLA-Permissive-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CDLA-Permissive-2.0.json",
- "referenceNumber": 295,
+ "referenceNumber": 294,
"name": "Community Data License Agreement Permissive 2.0",
"licenseId": "CDLA-Permissive-2.0",
"seeAlso": [
@@ -3683,7 +3671,7 @@
"reference": "https://spdx.org/licenses/CC-BY-ND-3.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-ND-3.0.json",
- "referenceNumber": 296,
+ "referenceNumber": 295,
"name": "Creative Commons Attribution No Derivatives 3.0 Unported",
"licenseId": "CC-BY-ND-3.0",
"seeAlso": [
@@ -3695,7 +3683,7 @@
"reference": "https://spdx.org/licenses/C-UDA-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/C-UDA-1.0.json",
- "referenceNumber": 297,
+ "referenceNumber": 296,
"name": "Computational Use of Data Agreement v1.0",
"licenseId": "C-UDA-1.0",
"seeAlso": [
@@ -3705,6 +3693,18 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/Barr.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/Barr.json",
+ "referenceNumber": 297,
+ "name": "Barr License",
+ "licenseId": "Barr",
+ "seeAlso": [
+ "https://fedoraproject.org/wiki/Licensing/Barr"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/Vim.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Vim.json",
@@ -3730,34 +3730,23 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Barr.html",
+ "reference": "https://spdx.org/licenses/BitTorrent-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Barr.json",
+ "detailsUrl": "https://spdx.org/licenses/BitTorrent-1.1.json",
"referenceNumber": 300,
- "name": "Barr License",
- "licenseId": "Barr",
- "seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Barr"
- ],
- "isOsiApproved": false
- },
- {
- "reference": "https://spdx.org/licenses/ADSL.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/ADSL.json",
- "referenceNumber": 301,
- "name": "Amazon Digital Services License",
- "licenseId": "ADSL",
+ "name": "BitTorrent Open Source License v1.1",
+ "licenseId": "BitTorrent-1.1",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/AmazonDigitalServicesLicense"
+ "http://directory.fsf.org/wiki/License:BitTorrentOSL1.1"
],
- "isOsiApproved": false
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/CDL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CDL-1.0.json",
- "referenceNumber": 302,
+ "referenceNumber": 301,
"name": "Common Documentation License 1.0",
"licenseId": "CDL-1.0",
"seeAlso": [
@@ -3771,7 +3760,7 @@
"reference": "https://spdx.org/licenses/CC-BY-SA-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CC-BY-SA-1.0.json",
- "referenceNumber": 303,
+ "referenceNumber": 302,
"name": "Creative Commons Attribution Share Alike 1.0 Generic",
"licenseId": "CC-BY-SA-1.0",
"seeAlso": [
@@ -3780,10 +3769,35 @@
"isOsiApproved": false
},
{
+ "reference": "https://spdx.org/licenses/ADSL.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/ADSL.json",
+ "referenceNumber": 303,
+ "name": "Amazon Digital Services License",
+ "licenseId": "ADSL",
+ "seeAlso": [
+ "https://fedoraproject.org/wiki/Licensing/AmazonDigitalServicesLicense"
+ ],
+ "isOsiApproved": false
+ },
+ {
+ "reference": "https://spdx.org/licenses/PostgreSQL.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/PostgreSQL.json",
+ "referenceNumber": 304,
+ "name": "PostgreSQL License",
+ "licenseId": "PostgreSQL",
+ "seeAlso": [
+ "http://www.postgresql.org/about/licence",
+ "https://opensource.org/licenses/PostgreSQL"
+ ],
+ "isOsiApproved": true
+ },
+ {
"reference": "https://spdx.org/licenses/OFL-1.1.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OFL-1.1.json",
- "referenceNumber": 304,
+ "referenceNumber": 305,
"name": "SIL Open Font License 1.1",
"licenseId": "OFL-1.1",
"seeAlso": [
@@ -3794,18 +3808,6 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/GLWTPL.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GLWTPL.json",
- "referenceNumber": 305,
- "name": "Good Luck With That Public License",
- "licenseId": "GLWTPL",
- "seeAlso": [
- "https://github.com/me-shaon/GLWTPL/commit/da5f6bc734095efbacb442c0b31e33a65b9d6e85"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/NPL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/NPL-1.0.json",
@@ -3892,17 +3894,16 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/PostgreSQL.html",
+ "reference": "https://spdx.org/licenses/GLWTPL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/PostgreSQL.json",
+ "detailsUrl": "https://spdx.org/licenses/GLWTPL.json",
"referenceNumber": 313,
- "name": "PostgreSQL License",
- "licenseId": "PostgreSQL",
+ "name": "Good Luck With That Public License",
+ "licenseId": "GLWTPL",
"seeAlso": [
- "http://www.postgresql.org/about/licence",
- "https://opensource.org/licenses/PostgreSQL"
+ "https://github.com/me-shaon/GLWTPL/commit/da5f6bc734095efbacb442c0b31e33a65b9d6e85"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/LGPL-3.0-only.html",
@@ -3993,36 +3994,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/AGPL-1.0-or-later.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/AGPL-1.0-or-later.json",
- "referenceNumber": 321,
- "name": "Affero General Public License v1.0 or later",
- "licenseId": "AGPL-1.0-or-later",
- "seeAlso": [
- "http://www.affero.org/oagpl.html"
- ],
- "isOsiApproved": false
- },
- {
- "reference": "https://spdx.org/licenses/BSL-1.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSL-1.0.json",
- "referenceNumber": 322,
- "name": "Boost Software License 1.0",
- "licenseId": "BSL-1.0",
- "seeAlso": [
- "http://www.boost.org/LICENSE_1_0.txt",
- "https://opensource.org/licenses/BSL-1.0"
- ],
- "isOsiApproved": true,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/IJG.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/IJG.json",
- "referenceNumber": 323,
+ "referenceNumber": 321,
"name": "Independent JPEG Group License",
"licenseId": "IJG",
"seeAlso": [
@@ -4032,10 +4007,22 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/AGPL-1.0-or-later.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/AGPL-1.0-or-later.json",
+ "referenceNumber": 322,
+ "name": "Affero General Public License v1.0 or later",
+ "licenseId": "AGPL-1.0-or-later",
+ "seeAlso": [
+ "http://www.affero.org/oagpl.html"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/OFL-1.1-no-RFN.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/OFL-1.1-no-RFN.json",
- "referenceNumber": 324,
+ "referenceNumber": 323,
"name": "SIL Open Font License 1.1 with no Reserved Font Name",
"licenseId": "OFL-1.1-no-RFN",
"seeAlso": [
@@ -4045,6 +4032,20 @@
"isOsiApproved": true
},
{
+ "reference": "https://spdx.org/licenses/BSL-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/BSL-1.0.json",
+ "referenceNumber": 324,
+ "name": "Boost Software License 1.0",
+ "licenseId": "BSL-1.0",
+ "seeAlso": [
+ "http://www.boost.org/LICENSE_1_0.txt",
+ "https://opensource.org/licenses/BSL-1.0"
+ ],
+ "isOsiApproved": true,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/Libpng.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Libpng.json",
@@ -4193,28 +4194,28 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/libselinux-1.0.html",
+ "reference": "https://spdx.org/licenses/CECILL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/libselinux-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CECILL-1.1.json",
"referenceNumber": 337,
- "name": "libselinux public domain notice",
- "licenseId": "libselinux-1.0",
+ "name": "CeCILL Free Software License Agreement v1.1",
+ "licenseId": "CECILL-1.1",
"seeAlso": [
- "https://github.com/SELinuxProject/selinux/blob/master/libselinux/LICENSE"
+ "http://www.cecill.info/licences/Licence_CeCILL_V1.1-US.html"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CECILL-1.1.html",
+ "reference": "https://spdx.org/licenses/CECILL-2.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CECILL-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/CECILL-2.1.json",
"referenceNumber": 338,
- "name": "CeCILL Free Software License Agreement v1.1",
- "licenseId": "CECILL-1.1",
+ "name": "CeCILL Free Software License Agreement v2.1",
+ "licenseId": "CECILL-2.1",
"seeAlso": [
- "http://www.cecill.info/licences/Licence_CeCILL_V1.1-US.html"
+ "http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/OGDL-Taiwan-1.0.html",
@@ -4229,39 +4230,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BSD-1-Clause.html",
+ "reference": "https://spdx.org/licenses/Abstyles.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-1-Clause.json",
+ "detailsUrl": "https://spdx.org/licenses/Abstyles.json",
"referenceNumber": 340,
- "name": "BSD 1-Clause License",
- "licenseId": "BSD-1-Clause",
+ "name": "Abstyles License",
+ "licenseId": "Abstyles",
"seeAlso": [
- "https://svnweb.freebsd.org/base/head/include/ifaddrs.h?revision\u003d326823"
+ "https://fedoraproject.org/wiki/Licensing/Abstyles"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BitTorrent-1.1.html",
+ "reference": "https://spdx.org/licenses/libselinux-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BitTorrent-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/libselinux-1.0.json",
"referenceNumber": 341,
- "name": "BitTorrent Open Source License v1.1",
- "licenseId": "BitTorrent-1.1",
- "seeAlso": [
- "http://directory.fsf.org/wiki/License:BitTorrentOSL1.1"
- ],
- "isOsiApproved": false,
- "isFsfLibre": true
- },
- {
- "reference": "https://spdx.org/licenses/MIT-enna.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MIT-enna.json",
- "referenceNumber": 342,
- "name": "enna License",
- "licenseId": "MIT-enna",
+ "name": "libselinux public domain notice",
+ "licenseId": "libselinux-1.0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/MIT#enna"
+ "https://github.com/SELinuxProject/selinux/blob/master/libselinux/LICENSE"
],
"isOsiApproved": false
},
@@ -4269,7 +4257,7 @@
"reference": "https://spdx.org/licenses/ANTLR-PD.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/ANTLR-PD.json",
- "referenceNumber": 343,
+ "referenceNumber": 342,
"name": "ANTLR Software Rights Notice",
"licenseId": "ANTLR-PD",
"seeAlso": [
@@ -4281,7 +4269,7 @@
"reference": "https://spdx.org/licenses/GPL-2.0-or-later.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/GPL-2.0-or-later.json",
- "referenceNumber": 344,
+ "referenceNumber": 343,
"name": "GNU General Public License v2.0 or later",
"licenseId": "GPL-2.0-or-later",
"seeAlso": [
@@ -4292,14 +4280,27 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CC-BY-SA-3.0-AT.html",
+ "reference": "https://spdx.org/licenses/IPL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-3.0-AT.json",
+ "detailsUrl": "https://spdx.org/licenses/IPL-1.0.json",
+ "referenceNumber": 344,
+ "name": "IBM Public License v1.0",
+ "licenseId": "IPL-1.0",
+ "seeAlso": [
+ "https://opensource.org/licenses/IPL-1.0"
+ ],
+ "isOsiApproved": true,
+ "isFsfLibre": true
+ },
+ {
+ "reference": "https://spdx.org/licenses/MIT-enna.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/MIT-enna.json",
"referenceNumber": 345,
- "name": "Creative Commons Attribution Share Alike 3.0 Austria",
- "licenseId": "CC-BY-SA-3.0-AT",
+ "name": "enna License",
+ "licenseId": "MIT-enna",
"seeAlso": [
- "https://creativecommons.org/licenses/by-sa/3.0/at/legalcode"
+ "https://fedoraproject.org/wiki/Licensing/MIT#enna"
],
"isOsiApproved": false
},
@@ -4316,17 +4317,16 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OFL-1.1-RFN.html",
+ "reference": "https://spdx.org/licenses/CC-BY-SA-3.0-AT.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OFL-1.1-RFN.json",
+ "detailsUrl": "https://spdx.org/licenses/CC-BY-SA-3.0-AT.json",
"referenceNumber": 347,
- "name": "SIL Open Font License 1.1 with Reserved Font Name",
- "licenseId": "OFL-1.1-RFN",
+ "name": "Creative Commons Attribution Share Alike 3.0 Austria",
+ "licenseId": "CC-BY-SA-3.0-AT",
"seeAlso": [
- "http://scripts.sil.org/cms/scripts/page.php?item_id\u003dOFL_web",
- "https://opensource.org/licenses/OFL-1.1"
+ "https://creativecommons.org/licenses/by-sa/3.0/at/legalcode"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/GPL-3.0-with-GCC-exception.html",
@@ -4341,17 +4341,16 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/IPL-1.0.html",
+ "reference": "https://spdx.org/licenses/BSD-1-Clause.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/IPL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/BSD-1-Clause.json",
"referenceNumber": 349,
- "name": "IBM Public License v1.0",
- "licenseId": "IPL-1.0",
+ "name": "BSD 1-Clause License",
+ "licenseId": "BSD-1-Clause",
"seeAlso": [
- "https://opensource.org/licenses/IPL-1.0"
+ "https://svnweb.freebsd.org/base/head/include/ifaddrs.h?revision\u003d326823"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/NTP-0.html",
@@ -4391,28 +4390,29 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/Watcom-1.0.html",
+ "reference": "https://spdx.org/licenses/OFL-1.1-RFN.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Watcom-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/OFL-1.1-RFN.json",
"referenceNumber": 353,
- "name": "Sybase Open Watcom Public License 1.0",
- "licenseId": "Watcom-1.0",
+ "name": "SIL Open Font License 1.1 with Reserved Font Name",
+ "licenseId": "OFL-1.1-RFN",
"seeAlso": [
- "https://opensource.org/licenses/Watcom-1.0"
+ "http://scripts.sil.org/cms/scripts/page.php?item_id\u003dOFL_web",
+ "https://opensource.org/licenses/OFL-1.1"
],
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/FSFULLR.html",
+ "reference": "https://spdx.org/licenses/Watcom-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/FSFULLR.json",
+ "detailsUrl": "https://spdx.org/licenses/Watcom-1.0.json",
"referenceNumber": 354,
- "name": "FSF Unlimited License (with License Retention)",
- "licenseId": "FSFULLR",
+ "name": "Sybase Open Watcom Public License 1.0",
+ "licenseId": "Watcom-1.0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/FSF_Unlimited_License#License_Retention_Variant"
+ "https://opensource.org/licenses/Watcom-1.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR.html",
@@ -4427,26 +4427,28 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BSD-2-Clause.html",
+ "reference": "https://spdx.org/licenses/ODbL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-2-Clause.json",
+ "detailsUrl": "https://spdx.org/licenses/ODbL-1.0.json",
"referenceNumber": 356,
- "name": "BSD 2-Clause \"Simplified\" License",
- "licenseId": "BSD-2-Clause",
+ "name": "Open Data Commons Open Database License v1.0",
+ "licenseId": "ODbL-1.0",
"seeAlso": [
- "https://opensource.org/licenses/BSD-2-Clause"
+ "http://www.opendatacommons.org/licenses/odbl/1.0/",
+ "https://opendatacommons.org/licenses/odbl/1-0/"
],
- "isOsiApproved": true
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/SSH-OpenSSH.html",
+ "reference": "https://spdx.org/licenses/FSFULLR.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/SSH-OpenSSH.json",
+ "detailsUrl": "https://spdx.org/licenses/FSFULLR.json",
"referenceNumber": 357,
- "name": "SSH OpenSSH license",
- "licenseId": "SSH-OpenSSH",
+ "name": "FSF Unlimited License (with License Retention)",
+ "licenseId": "FSFULLR",
"seeAlso": [
- "https://github.com/openssh/openssh-portable/blob/1b11ea7c58cd5c59838b5fa574cd456d6047b2d4/LICENCE#L10"
+ "https://fedoraproject.org/wiki/Licensing/FSF_Unlimited_License#License_Retention_Variant"
],
"isOsiApproved": false
},
@@ -4463,31 +4465,28 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/ODbL-1.0.html",
+ "reference": "https://spdx.org/licenses/SSH-OpenSSH.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/ODbL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/SSH-OpenSSH.json",
"referenceNumber": 359,
- "name": "Open Data Commons Open Database License v1.0",
- "licenseId": "ODbL-1.0",
+ "name": "SSH OpenSSH license",
+ "licenseId": "SSH-OpenSSH",
"seeAlso": [
- "http://www.opendatacommons.org/licenses/odbl/1.0/",
- "https://opendatacommons.org/licenses/odbl/1-0/"
+ "https://github.com/openssh/openssh-portable/blob/1b11ea7c58cd5c59838b5fa574cd456d6047b2d4/LICENCE#L10"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.3-only.html",
+ "reference": "https://spdx.org/licenses/BSD-2-Clause.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-only.json",
+ "detailsUrl": "https://spdx.org/licenses/BSD-2-Clause.json",
"referenceNumber": 360,
- "name": "GNU Free Documentation License v1.3 only",
- "licenseId": "GFDL-1.3-only",
+ "name": "BSD 2-Clause \"Simplified\" License",
+ "licenseId": "BSD-2-Clause",
"seeAlso": [
- "https://www.gnu.org/licenses/fdl-1.3.txt"
+ "https://opensource.org/licenses/BSD-2-Clause"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/HPND.html",
@@ -4503,17 +4502,17 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/NASA-1.3.html",
+ "reference": "https://spdx.org/licenses/Zimbra-1.3.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NASA-1.3.json",
+ "detailsUrl": "https://spdx.org/licenses/Zimbra-1.3.json",
"referenceNumber": 362,
- "name": "NASA Open Source Agreement 1.3",
- "licenseId": "NASA-1.3",
+ "name": "Zimbra Public License v1.3",
+ "licenseId": "Zimbra-1.3",
"seeAlso": [
- "http://ti.arc.nasa.gov/opensource/nosa/",
- "https://opensource.org/licenses/NASA-1.3"
+ "http://web.archive.org/web/20100302225219/http://www.zimbra.com/license/zimbra-public-license-1-3.html"
],
- "isOsiApproved": true
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/Borceux.html",
@@ -4552,17 +4551,17 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CPAL-1.0.html",
+ "reference": "https://spdx.org/licenses/NASA-1.3.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CPAL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/NASA-1.3.json",
"referenceNumber": 366,
- "name": "Common Public Attribution License 1.0",
- "licenseId": "CPAL-1.0",
+ "name": "NASA Open Source Agreement 1.3",
+ "licenseId": "NASA-1.3",
"seeAlso": [
- "https://opensource.org/licenses/CPAL-1.0"
+ "http://ti.arc.nasa.gov/opensource/nosa/",
+ "https://opensource.org/licenses/NASA-1.3"
],
- "isOsiApproved": true,
- "isFsfLibre": true
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/VOSTROM.html",
@@ -4577,16 +4576,18 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Abstyles.html",
+ "reference": "https://spdx.org/licenses/MIT-0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Abstyles.json",
+ "detailsUrl": "https://spdx.org/licenses/MIT-0.json",
"referenceNumber": 368,
- "name": "Abstyles License",
- "licenseId": "Abstyles",
+ "name": "MIT No Attribution",
+ "licenseId": "MIT-0",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Abstyles"
+ "https://github.com/aws/mit-0",
+ "https://romanrm.net/mit-zero",
+ "https://github.com/awsdocs/aws-cloud9-user-guide/blob/master/LICENSE-SAMPLECODE"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/ISC.html",
@@ -4641,18 +4642,17 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/MIT-0.html",
+ "reference": "https://spdx.org/licenses/NOSL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/MIT-0.json",
+ "detailsUrl": "https://spdx.org/licenses/NOSL.json",
"referenceNumber": 373,
- "name": "MIT No Attribution",
- "licenseId": "MIT-0",
+ "name": "Netizen Open Source License",
+ "licenseId": "NOSL",
"seeAlso": [
- "https://github.com/aws/mit-0",
- "https://romanrm.net/mit-zero",
- "https://github.com/awsdocs/aws-cloud9-user-guide/blob/master/LICENSE-SAMPLECODE"
+ "http://bits.netizen.com.au/licenses/NOSL/nosl.txt"
],
- "isOsiApproved": true
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/SMLNJ.html",
@@ -4681,16 +4681,16 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/NOSL.html",
+ "reference": "https://spdx.org/licenses/CPAL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NOSL.json",
+ "detailsUrl": "https://spdx.org/licenses/CPAL-1.0.json",
"referenceNumber": 376,
- "name": "Netizen Open Source License",
- "licenseId": "NOSL",
+ "name": "Common Public Attribution License 1.0",
+ "licenseId": "CPAL-1.0",
"seeAlso": [
- "http://bits.netizen.com.au/licenses/NOSL/nosl.txt"
+ "https://opensource.org/licenses/CPAL-1.0"
],
- "isOsiApproved": false,
+ "isOsiApproved": true,
"isFsfLibre": true
},
{
@@ -4783,56 +4783,55 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CDDL-1.1.html",
+ "reference": "https://spdx.org/licenses/EUPL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CDDL-1.1.json",
+ "detailsUrl": "https://spdx.org/licenses/EUPL-1.0.json",
"referenceNumber": 384,
- "name": "Common Development and Distribution License 1.1",
- "licenseId": "CDDL-1.1",
+ "name": "European Union Public License 1.0",
+ "licenseId": "EUPL-1.0",
"seeAlso": [
- "http://glassfish.java.net/public/CDDL+GPL_1_1.html",
- "https://javaee.github.io/glassfish/LICENSE"
+ "http://ec.europa.eu/idabc/en/document/7330.html",
+ "http://ec.europa.eu/idabc/servlets/Doc027f.pdf?id\u003d31096"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Zimbra-1.3.html",
+ "reference": "https://spdx.org/licenses/CDDL-1.1.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Zimbra-1.3.json",
+ "detailsUrl": "https://spdx.org/licenses/CDDL-1.1.json",
"referenceNumber": 385,
- "name": "Zimbra Public License v1.3",
- "licenseId": "Zimbra-1.3",
+ "name": "Common Development and Distribution License 1.1",
+ "licenseId": "CDDL-1.1",
"seeAlso": [
- "http://web.archive.org/web/20100302225219/http://www.zimbra.com/license/zimbra-public-license-1-3.html"
+ "http://glassfish.java.net/public/CDDL+GPL_1_1.html",
+ "https://javaee.github.io/glassfish/LICENSE"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/EUPL-1.0.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.3-only.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/EUPL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.3-only.json",
"referenceNumber": 386,
- "name": "European Union Public License 1.0",
- "licenseId": "EUPL-1.0",
+ "name": "GNU Free Documentation License v1.3 only",
+ "licenseId": "GFDL-1.3-only",
"seeAlso": [
- "http://ec.europa.eu/idabc/en/document/7330.html",
- "http://ec.europa.eu/idabc/servlets/Doc027f.pdf?id\u003d31096"
+ "https://www.gnu.org/licenses/fdl-1.3.txt"
],
- "isOsiApproved": false
+ "isOsiApproved": false,
+ "isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/Fair.html",
+ "reference": "https://spdx.org/licenses/OLDAP-2.6.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Fair.json",
+ "detailsUrl": "https://spdx.org/licenses/OLDAP-2.6.json",
"referenceNumber": 387,
- "name": "Fair License",
- "licenseId": "Fair",
+ "name": "Open LDAP Public License v2.6",
+ "licenseId": "OLDAP-2.6",
"seeAlso": [
- "http://fairlicense.org/",
- "https://opensource.org/licenses/Fair"
+ "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003d1cae062821881f41b73012ba816434897abf4205"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/JSON.html",
@@ -4875,17 +4874,17 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/OPL-1.0.html",
+ "reference": "https://spdx.org/licenses/Fair.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OPL-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/Fair.json",
"referenceNumber": 391,
- "name": "Open Public License v1.0",
- "licenseId": "OPL-1.0",
+ "name": "Fair License",
+ "licenseId": "Fair",
"seeAlso": [
- "http://old.koalateam.com/jackaroo/OPL_1_0.TXT",
- "https://fedoraproject.org/wiki/Licensing/Open_Public_License"
+ "http://fairlicense.org/",
+ "https://opensource.org/licenses/Fair"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/GPL-2.0-with-font-exception.html",
@@ -4977,14 +4976,15 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/OLDAP-2.6.html",
+ "reference": "https://spdx.org/licenses/OPL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OLDAP-2.6.json",
+ "detailsUrl": "https://spdx.org/licenses/OPL-1.0.json",
"referenceNumber": 399,
- "name": "Open LDAP Public License v2.6",
- "licenseId": "OLDAP-2.6",
+ "name": "Open Public License v1.0",
+ "licenseId": "OPL-1.0",
"seeAlso": [
- "http://www.openldap.org/devel/gitweb.cgi?p\u003dopenldap.git;a\u003dblob;f\u003dLICENSE;hb\u003d1cae062821881f41b73012ba816434897abf4205"
+ "http://old.koalateam.com/jackaroo/OPL_1_0.TXT",
+ "https://fedoraproject.org/wiki/Licensing/Open_Public_License"
],
"isOsiApproved": false
},
@@ -5001,49 +5001,24 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/NCGL-UK-2.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NCGL-UK-2.0.json",
- "referenceNumber": 401,
- "name": "Non-Commercial Government Licence",
- "licenseId": "NCGL-UK-2.0",
- "seeAlso": [
- "http://www.nationalarchives.gov.uk/doc/non-commercial-government-licence/version/2/"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/QPL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/QPL-1.0.json",
- "referenceNumber": 402,
+ "referenceNumber": 401,
"name": "Q Public License 1.0",
"licenseId": "QPL-1.0",
"seeAlso": [
"http://doc.qt.nokia.com/3.3/license.html",
- "https://opensource.org/licenses/QPL-1.0",
- "https://doc.qt.io/archives/3.3/license.html"
+ "https://opensource.org/licenses/QPL-1.0"
],
"isOsiApproved": true,
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.json",
- "referenceNumber": 403,
- "name": "GNU Free Documentation License v1.2 or later - no invariants",
- "licenseId": "GFDL-1.2-no-invariants-or-later",
- "seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/EUPL-1.2.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EUPL-1.2.json",
- "referenceNumber": 404,
+ "referenceNumber": 402,
"name": "European Union Public License 1.2",
"licenseId": "EUPL-1.2",
"seeAlso": [
@@ -5057,15 +5032,14 @@
"isOsiApproved": true
},
{
- "reference": "https://spdx.org/licenses/Beerware.html",
+ "reference": "https://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Beerware.json",
- "referenceNumber": 405,
- "name": "Beerware License",
- "licenseId": "Beerware",
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.json",
+ "referenceNumber": 403,
+ "name": "GNU Free Documentation License v1.2 or later - no invariants",
+ "licenseId": "GFDL-1.2-no-invariants-or-later",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Beerware",
- "https://people.freebsd.org/~phk/"
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt"
],
"isOsiApproved": false
},
@@ -5073,7 +5047,7 @@
"reference": "https://spdx.org/licenses/eCos-2.0.html",
"isDeprecatedLicenseId": true,
"detailsUrl": "https://spdx.org/licenses/eCos-2.0.json",
- "referenceNumber": 406,
+ "referenceNumber": 404,
"name": "eCos license version 2.0",
"licenseId": "eCos-2.0",
"seeAlso": [
@@ -5082,27 +5056,27 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CAL-1.0.html",
+ "reference": "https://spdx.org/licenses/NCGL-UK-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CAL-1.0.json",
- "referenceNumber": 407,
- "name": "Cryptographic Autonomy License 1.0",
- "licenseId": "CAL-1.0",
+ "detailsUrl": "https://spdx.org/licenses/NCGL-UK-2.0.json",
+ "referenceNumber": 405,
+ "name": "Non-Commercial Government Licence",
+ "licenseId": "NCGL-UK-2.0",
"seeAlso": [
- "http://cryptographicautonomylicense.com/license-text.html",
- "https://opensource.org/licenses/CAL-1.0"
+ "http://www.nationalarchives.gov.uk/doc/non-commercial-government-licence/version/2/"
],
- "isOsiApproved": true
+ "isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GPL-2.0-with-bison-exception.html",
- "isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/GPL-2.0-with-bison-exception.json",
- "referenceNumber": 408,
- "name": "GNU General Public License v2.0 w/Bison exception",
- "licenseId": "GPL-2.0-with-bison-exception",
+ "reference": "https://spdx.org/licenses/Beerware.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/Beerware.json",
+ "referenceNumber": 406,
+ "name": "Beerware License",
+ "licenseId": "Beerware",
"seeAlso": [
- "http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id\u003d193d7c7054ba7197b0789e14965b739162319b5e#n141"
+ "https://fedoraproject.org/wiki/Licensing/Beerware",
+ "https://people.freebsd.org/~phk/"
],
"isOsiApproved": false
},
@@ -5110,7 +5084,7 @@
"reference": "https://spdx.org/licenses/BSD-3-Clause-Open-MPI.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-Open-MPI.json",
- "referenceNumber": 409,
+ "referenceNumber": 407,
"name": "BSD 3-Clause Open MPI variant",
"licenseId": "BSD-3-Clause-Open-MPI",
"seeAlso": [
@@ -5120,14 +5094,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GPL-2.0-with-autoconf-exception.html",
+ "reference": "https://spdx.org/licenses/GPL-2.0-with-bison-exception.html",
"isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/GPL-2.0-with-autoconf-exception.json",
- "referenceNumber": 410,
- "name": "GNU General Public License v2.0 w/Autoconf exception",
- "licenseId": "GPL-2.0-with-autoconf-exception",
+ "detailsUrl": "https://spdx.org/licenses/GPL-2.0-with-bison-exception.json",
+ "referenceNumber": 408,
+ "name": "GNU General Public License v2.0 w/Bison exception",
+ "licenseId": "GPL-2.0-with-bison-exception",
"seeAlso": [
- "http://ac-archive.sourceforge.net/doc/copyright.html"
+ "http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id\u003d193d7c7054ba7197b0789e14965b739162319b5e#n141"
],
"isOsiApproved": false
},
@@ -5135,7 +5109,7 @@
"reference": "https://spdx.org/licenses/CECILL-B.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/CECILL-B.json",
- "referenceNumber": 411,
+ "referenceNumber": 409,
"name": "CeCILL-B Free Software License Agreement",
"licenseId": "CECILL-B",
"seeAlso": [
@@ -5145,10 +5119,22 @@
"isFsfLibre": true
},
{
+ "reference": "https://spdx.org/licenses/GPL-2.0-with-autoconf-exception.html",
+ "isDeprecatedLicenseId": true,
+ "detailsUrl": "https://spdx.org/licenses/GPL-2.0-with-autoconf-exception.json",
+ "referenceNumber": 410,
+ "name": "GNU General Public License v2.0 w/Autoconf exception",
+ "licenseId": "GPL-2.0-with-autoconf-exception",
+ "seeAlso": [
+ "http://ac-archive.sourceforge.net/doc/copyright.html"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/EPL-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/EPL-2.0.json",
- "referenceNumber": 412,
+ "referenceNumber": 411,
"name": "Eclipse Public License 2.0",
"licenseId": "EPL-2.0",
"seeAlso": [
@@ -5162,7 +5148,7 @@
"reference": "https://spdx.org/licenses/MIT-feh.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MIT-feh.json",
- "referenceNumber": 413,
+ "referenceNumber": 412,
"name": "feh License",
"licenseId": "MIT-feh",
"seeAlso": [
@@ -5174,7 +5160,7 @@
"reference": "https://spdx.org/licenses/RPL-1.1.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/RPL-1.1.json",
- "referenceNumber": 414,
+ "referenceNumber": 413,
"name": "Reciprocal Public License 1.1",
"licenseId": "RPL-1.1",
"seeAlso": [
@@ -5183,6 +5169,18 @@
"isOsiApproved": true
},
{
+ "reference": "https://spdx.org/licenses/CDLA-Permissive-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/CDLA-Permissive-1.0.json",
+ "referenceNumber": 414,
+ "name": "Community Data License Agreement Permissive 1.0",
+ "licenseId": "CDLA-Permissive-1.0",
+ "seeAlso": [
+ "https://cdla.io/permissive-1-0"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/Python-2.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Python-2.0.json",
@@ -5196,22 +5194,10 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/CDLA-Permissive-1.0.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CDLA-Permissive-1.0.json",
- "referenceNumber": 416,
- "name": "Community Data License Agreement Permissive 1.0",
- "licenseId": "CDLA-Permissive-1.0",
- "seeAlso": [
- "https://cdla.io/permissive-1-0"
- ],
- "isOsiApproved": false
- },
- {
"reference": "https://spdx.org/licenses/MPL-1.0.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/MPL-1.0.json",
- "referenceNumber": 417,
+ "referenceNumber": 416,
"name": "Mozilla Public License 1.0",
"licenseId": "MPL-1.0",
"seeAlso": [
@@ -5221,6 +5207,19 @@
"isOsiApproved": true
},
{
+ "reference": "https://spdx.org/licenses/GFDL-1.1-or-later.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/GFDL-1.1-or-later.json",
+ "referenceNumber": 417,
+ "name": "GNU Free Documentation License v1.1 or later",
+ "licenseId": "GFDL-1.1-or-later",
+ "seeAlso": [
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt"
+ ],
+ "isOsiApproved": false,
+ "isFsfLibre": true
+ },
+ {
"reference": "https://spdx.org/licenses/diffmark.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/diffmark.json",
@@ -5245,14 +5244,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/GFDL-1.1-or-later.html",
+ "reference": "https://spdx.org/licenses/OpenSSL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/GFDL-1.1-or-later.json",
+ "detailsUrl": "https://spdx.org/licenses/OpenSSL.json",
"referenceNumber": 420,
- "name": "GNU Free Documentation License v1.1 or later",
- "licenseId": "GFDL-1.1-or-later",
+ "name": "OpenSSL License",
+ "licenseId": "OpenSSL",
"seeAlso": [
- "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt"
+ "http://www.openssl.org/source/license.html"
],
"isOsiApproved": false,
"isFsfLibre": true
@@ -5283,14 +5282,14 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OpenSSL.html",
- "isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OpenSSL.json",
+ "reference": "https://spdx.org/licenses/AGPL-1.0.html",
+ "isDeprecatedLicenseId": true,
+ "detailsUrl": "https://spdx.org/licenses/AGPL-1.0.json",
"referenceNumber": 423,
- "name": "OpenSSL License",
- "licenseId": "OpenSSL",
+ "name": "Affero General Public License v1.0",
+ "licenseId": "AGPL-1.0",
"seeAlso": [
- "http://www.openssl.org/source/license.html"
+ "http://www.affero.org/oagpl.html"
],
"isOsiApproved": false,
"isFsfLibre": true
@@ -5335,23 +5334,10 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/AGPL-1.0.html",
- "isDeprecatedLicenseId": true,
- "detailsUrl": "https://spdx.org/licenses/AGPL-1.0.json",
- "referenceNumber": 427,
- "name": "Affero General Public License v1.0",
- "licenseId": "AGPL-1.0",
- "seeAlso": [
- "http://www.affero.org/oagpl.html"
- ],
- "isOsiApproved": false,
- "isFsfLibre": true
- },
- {
"reference": "https://spdx.org/licenses/Xnet.html",
"isDeprecatedLicenseId": false,
"detailsUrl": "https://spdx.org/licenses/Xnet.json",
- "referenceNumber": 428,
+ "referenceNumber": 427,
"name": "X.Net License",
"licenseId": "Xnet",
"seeAlso": [
@@ -5360,6 +5346,18 @@
"isOsiApproved": true
},
{
+ "reference": "https://spdx.org/licenses/TU-Berlin-1.0.html",
+ "isDeprecatedLicenseId": false,
+ "detailsUrl": "https://spdx.org/licenses/TU-Berlin-1.0.json",
+ "referenceNumber": 428,
+ "name": "Technische Universitaet Berlin License 1.0",
+ "licenseId": "TU-Berlin-1.0",
+ "seeAlso": [
+ "https://github.com/swh/ladspa/blob/7bf6f3799fdba70fda297c2d8fd9f526803d9680/gsm/COPYRIGHT"
+ ],
+ "isOsiApproved": false
+ },
+ {
"reference": "https://spdx.org/licenses/AGPL-3.0.html",
"isDeprecatedLicenseId": true,
"detailsUrl": "https://spdx.org/licenses/AGPL-3.0.json",
@@ -5374,16 +5372,17 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/TU-Berlin-1.0.html",
+ "reference": "https://spdx.org/licenses/CAL-1.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/TU-Berlin-1.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CAL-1.0.json",
"referenceNumber": 430,
- "name": "Technische Universitaet Berlin License 1.0",
- "licenseId": "TU-Berlin-1.0",
+ "name": "Cryptographic Autonomy License 1.0",
+ "licenseId": "CAL-1.0",
"seeAlso": [
- "https://github.com/swh/ladspa/blob/7bf6f3799fdba70fda297c2d8fd9f526803d9680/gsm/COPYRIGHT"
+ "http://cryptographicautonomylicense.com/license-text.html",
+ "https://opensource.org/licenses/CAL-1.0"
],
- "isOsiApproved": false
+ "isOsiApproved": true
},
{
"reference": "https://spdx.org/licenses/AFL-3.0.html",
@@ -5400,16 +5399,16 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/APSL-2.0.html",
+ "reference": "https://spdx.org/licenses/CECILL-C.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/APSL-2.0.json",
+ "detailsUrl": "https://spdx.org/licenses/CECILL-C.json",
"referenceNumber": 432,
- "name": "Apple Public Source License 2.0",
- "licenseId": "APSL-2.0",
+ "name": "CeCILL-C Free Software License Agreement",
+ "licenseId": "CECILL-C",
"seeAlso": [
- "http://www.opensource.apple.com/license/apsl/"
+ "http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html"
],
- "isOsiApproved": true,
+ "isOsiApproved": false,
"isFsfLibre": true
},
{
@@ -5425,30 +5424,29 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/CECILL-C.html",
+ "reference": "https://spdx.org/licenses/BSD-3-Clause-Clear.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/CECILL-C.json",
+ "detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-Clear.json",
"referenceNumber": 434,
- "name": "CeCILL-C Free Software License Agreement",
- "licenseId": "CECILL-C",
+ "name": "BSD 3-Clause Clear License",
+ "licenseId": "BSD-3-Clause-Clear",
"seeAlso": [
- "http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html"
+ "http://labs.metacarta.com/license-explanation.html#license"
],
"isOsiApproved": false,
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/BSD-3-Clause-Clear.html",
+ "reference": "https://spdx.org/licenses/BSD-3-Clause-Modification.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-Clear.json",
+ "detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-Modification.json",
"referenceNumber": 435,
- "name": "BSD 3-Clause Clear License",
- "licenseId": "BSD-3-Clause-Clear",
+ "name": "BSD 3-Clause Modification",
+ "licenseId": "BSD-3-Clause-Modification",
"seeAlso": [
- "http://labs.metacarta.com/license-explanation.html#license"
+ "https://fedoraproject.org/wiki/Licensing:BSD#Modification_Variant"
],
- "isOsiApproved": false,
- "isFsfLibre": true
+ "isOsiApproved": false
},
{
"reference": "https://spdx.org/licenses/CC-BY-SA-2.0-UK.html",
@@ -5511,26 +5509,26 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/BSD-3-Clause-Modification.html",
+ "reference": "https://spdx.org/licenses/Spencer-86.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/BSD-3-Clause-Modification.json",
+ "detailsUrl": "https://spdx.org/licenses/Spencer-86.json",
"referenceNumber": 441,
- "name": "BSD 3-Clause Modification",
- "licenseId": "BSD-3-Clause-Modification",
+ "name": "Spencer License 86",
+ "licenseId": "Spencer-86",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing:BSD#Modification_Variant"
+ "https://fedoraproject.org/wiki/Licensing/Henry_Spencer_Reg-Ex_Library_License"
],
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/Spencer-86.html",
+ "reference": "https://spdx.org/licenses/OCCT-PL.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/Spencer-86.json",
+ "detailsUrl": "https://spdx.org/licenses/OCCT-PL.json",
"referenceNumber": 442,
- "name": "Spencer License 86",
- "licenseId": "Spencer-86",
+ "name": "Open CASCADE Technology Public License",
+ "licenseId": "OCCT-PL",
"seeAlso": [
- "https://fedoraproject.org/wiki/Licensing/Henry_Spencer_Reg-Ex_Library_License"
+ "http://www.opencascade.com/content/occt-public-license"
],
"isOsiApproved": false
},
@@ -5572,14 +5570,15 @@
"isOsiApproved": false
},
{
- "reference": "https://spdx.org/licenses/OCCT-PL.html",
+ "reference": "https://spdx.org/licenses/NIST-PD.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/OCCT-PL.json",
+ "detailsUrl": "https://spdx.org/licenses/NIST-PD.json",
"referenceNumber": 446,
- "name": "Open CASCADE Technology Public License",
- "licenseId": "OCCT-PL",
+ "name": "NIST Public Domain Notice",
+ "licenseId": "NIST-PD",
"seeAlso": [
- "http://www.opencascade.com/content/occt-public-license"
+ "https://github.com/tcheneau/simpleRPL/blob/e645e69e38dd4e3ccfeceb2db8cba05b7c2e0cd3/LICENSE.txt",
+ "https://github.com/tcheneau/Routing/blob/f09f46fcfe636107f22f2c98348188a65a135d98/README.md"
],
"isOsiApproved": false
},
@@ -5597,17 +5596,17 @@
"isFsfLibre": true
},
{
- "reference": "https://spdx.org/licenses/NIST-PD.html",
+ "reference": "https://spdx.org/licenses/APSL-2.0.html",
"isDeprecatedLicenseId": false,
- "detailsUrl": "https://spdx.org/licenses/NIST-PD.json",
+ "detailsUrl": "https://spdx.org/licenses/APSL-2.0.json",
"referenceNumber": 448,
- "name": "NIST Public Domain Notice",
- "licenseId": "NIST-PD",
+ "name": "Apple Public Source License 2.0",
+ "licenseId": "APSL-2.0",
"seeAlso": [
- "https://github.com/tcheneau/simpleRPL/blob/e645e69e38dd4e3ccfeceb2db8cba05b7c2e0cd3/LICENSE.txt",
- "https://github.com/tcheneau/Routing/blob/f09f46fcfe636107f22f2c98348188a65a135d98/README.md"
+ "http://www.opensource.apple.com/license/apsl/"
],
- "isOsiApproved": false
+ "isOsiApproved": true,
+ "isFsfLibre": true
},
{
"reference": "https://spdx.org/licenses/Leptonica.html",
@@ -5934,5 +5933,5 @@
"isOsiApproved": false
}
],
- "releaseDate": "2021-08-19"
+ "releaseDate": "2021-08-08"
} \ No newline at end of file
diff --git a/meta/lib/buildstats.py b/meta/lib/buildstats.py
index 8627ed3c31..c52b6c3b72 100644
--- a/meta/lib/buildstats.py
+++ b/meta/lib/buildstats.py
@@ -43,8 +43,8 @@ class SystemStats:
# depends on the heartbeat event, which fires less often.
self.min_seconds = 1
- self.meminfo_regex = re.compile(b'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)')
- self.diskstats_regex = re.compile(b'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$')
+ self.meminfo_regex = re.compile(rb'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)')
+ self.diskstats_regex = re.compile(rb'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$')
self.diskstats_ltime = None
self.diskstats_data = None
self.stat_ltimes = None
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index 492f096eaa..1bce6cb792 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -109,16 +109,33 @@ class LocalSigner(object):
bb.fatal("Could not get gpg version: %s" % e)
- def verify(self, sig_file):
+ def verify(self, sig_file, valid_sigs = ''):
"""Verify signature"""
- cmd = self.gpg_cmd + ["--verify", "--no-permission-warning"]
+ cmd = self.gpg_cmd + ["--verify", "--no-permission-warning", "--status-fd", "1"]
if self.gpg_path:
cmd += ["--homedir", self.gpg_path]
cmd += [sig_file]
- status = subprocess.call(cmd)
- ret = False if status else True
- return ret
+ status = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ # Valid if any key matches if unspecified
+ if not valid_sigs:
+ ret = False if status.returncode else True
+ return ret
+
+ import re
+ goodsigs = []
+ sigre = re.compile(r'^\[GNUPG:\] GOODSIG (\S+)\s(.*)$')
+ for l in status.stdout.decode("utf-8").splitlines():
+ s = sigre.match(l)
+ if s:
+ goodsigs += [s.group(1)]
+
+ for sig in valid_sigs.split():
+ if sig in goodsigs:
+ return True
+ if len(goodsigs):
+ bb.warn('No accepted signatures found. Good signatures found: %s.' % ' '.join(goodsigs))
+ return False
def get_signer(d, backend):
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index 665d32ecbb..b5d378a549 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -74,6 +74,9 @@ class FlattenVisitor(LicenseVisitor):
def visit_Str(self, node):
self.licenses.append(node.s)
+ def visit_Constant(self, node):
+ self.licenses.append(node.value)
+
def visit_BinOp(self, node):
if isinstance(node.op, ast.BitOr):
left = FlattenVisitor(self.choose_licenses)
@@ -227,6 +230,9 @@ class ListVisitor(LicenseVisitor):
def visit_Str(self, node):
self.licenses.add(node.s)
+ def visit_Constant(self, node):
+ self.licenses.add(node.value)
+
def list_licenses(licensestr):
"""Simply get a list of all licenses mentioned in a license string.
Binary operators are not applied or taken into account in any way"""
diff --git a/meta/lib/oe/maketype.py b/meta/lib/oe/maketype.py
index d929c8b3e5..d36082c535 100644
--- a/meta/lib/oe/maketype.py
+++ b/meta/lib/oe/maketype.py
@@ -10,12 +10,7 @@ the arguments of the type's factory for details.
import inspect
import oe.types as types
-try:
- # Python 3.7+
- from collections.abc import Callable
-except ImportError:
- # Python < 3.7
- from collections import Callable
+from collections.abc import Callable
available_types = {}
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py
index 8f7b60e077..80bc1a6bc6 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -321,7 +321,7 @@ class PackageManager(object, metaclass=ABCMeta):
# TODO don't have sdk here but have a property on the superclass
# (and respect in install_complementary)
if sdk:
- pkgdatadir = self.d.expand("${TMPDIR}/pkgdata/${SDK_SYS}")
+ pkgdatadir = self.d.getVar("PKGDATA_DIR_SDK")
else:
pkgdatadir = self.d.getVar("PKGDATA_DIR")
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 02c81e5a52..212f048bc6 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -19,7 +19,7 @@ def read_pkgdatafile(fn):
import re
with open(fn, 'r') as f:
lines = f.readlines()
- r = re.compile("(^.+?):\s+(.*)")
+ r = re.compile(r"(^.+?):\s+(.*)")
for l in lines:
m = r.match(l)
if m:
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index e8a854a302..efab7e8564 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -171,6 +171,40 @@ def elf_machine_to_string(machine):
except:
return "Unknown (%s)" % repr(machine)
+def write_error(type, error, d):
+ logfile = d.getVar('QA_LOGFILE')
+ if logfile:
+ p = d.getVar('P')
+ with open(logfile, "a+") as f:
+ f.write("%s: %s [%s]\n" % (p, error, type))
+
+def handle_error(error_class, error_msg, d):
+ if error_class in (d.getVar("ERROR_QA") or "").split():
+ write_error(error_class, error_msg, d)
+ bb.error("QA Issue: %s [%s]" % (error_msg, error_class))
+ d.setVar("QA_ERRORS_FOUND", "True")
+ return False
+ elif error_class in (d.getVar("WARN_QA") or "").split():
+ write_error(error_class, error_msg, d)
+ bb.warn("QA Issue: %s [%s]" % (error_msg, error_class))
+ else:
+ bb.note("QA Issue: %s [%s]" % (error_msg, error_class))
+ return True
+
+def add_message(messages, section, new_msg):
+ if section not in messages:
+ messages[section] = new_msg
+ else:
+ messages[section] = messages[section] + "\n" + new_msg
+
+def exit_with_message_if_errors(message, d):
+ qa_fatal_errors = bb.utils.to_boolean(d.getVar("QA_ERRORS_FOUND"), False)
+ if qa_fatal_errors:
+ bb.fatal(message)
+
+def exit_if_errors(d):
+ exit_with_message_if_errors("Fatal QA errors were found, failing task.", d)
+
if __name__ == "__main__":
import sys
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py
index 204b9bd734..4fb99d963c 100644
--- a/meta/lib/oe/reproducible.py
+++ b/meta/lib/oe/reproducible.py
@@ -5,6 +5,57 @@ import os
import subprocess
import bb
+# For reproducible builds, this code sets the default SOURCE_DATE_EPOCH in each
+# component's build environment. The format is number of seconds since the
+# system epoch.
+#
+# Upstream components (generally) respect this environment variable,
+# using it in place of the "current" date and time.
+# See https://reproducible-builds.org/specs/source-date-epoch/
+#
+# The default value of SOURCE_DATE_EPOCH comes from the function
+# get_source_date_epoch_value which reads from the SDE_FILE, or if the file
+# is not available will use the fallback of SOURCE_DATE_EPOCH_FALLBACK.
+#
+# The SDE_FILE is normally constructed from the function
+# create_source_date_epoch_stamp which is typically added as a postfuncs to
+# the do_unpack task. If a recipe does NOT have do_unpack, it should be added
+# to a task that runs after the source is available and before the
+# do_deploy_source_date_epoch task is executed.
+#
+# If a recipe wishes to override the default behavior it should set it's own
+# SOURCE_DATE_EPOCH or override the do_deploy_source_date_epoch_stamp task
+# with recipe-specific functionality to write the appropriate
+# SOURCE_DATE_EPOCH into the SDE_FILE.
+#
+# SOURCE_DATE_EPOCH is intended to be a reproducible value. This value should
+# be reproducible for anyone who builds the same revision from the same
+# sources.
+#
+# There are 4 ways the create_source_date_epoch_stamp function determines what
+# becomes SOURCE_DATE_EPOCH:
+#
+# 1. Use the value from __source_date_epoch.txt file if this file exists.
+# This file was most likely created in the previous build by one of the
+# following methods 2,3,4.
+# Alternatively, it can be provided by a recipe via SRC_URI.
+#
+# If the file does not exist:
+#
+# 2. If there is a git checkout, use the last git commit timestamp.
+# Git does not preserve file timestamps on checkout.
+#
+# 3. Use the mtime of "known" files such as NEWS, CHANGLELOG, ...
+# This works for well-kept repositories distributed via tarball.
+#
+# 4. Use the modification time of the youngest file in the source tree, if
+# there is one.
+# This will be the newest file from the distribution tarball, if any.
+#
+# 5. Fall back to a fixed timestamp (SOURCE_DATE_EPOCH_FALLBACK).
+#
+# Once the value is determined, it is stored in the recipe's SDE_FILE.
+
def get_source_date_epoch_from_known_files(d, sourcedir):
source_date_epoch = None
newest_file = None
@@ -106,3 +157,36 @@ def get_source_date_epoch(d, sourcedir):
fixed_source_date_epoch(d) # Last resort
)
+def epochfile_read(epochfile, d):
+ cached, efile = d.getVar('__CACHED_SOURCE_DATE_EPOCH') or (None, None)
+ if cached and efile == epochfile:
+ return cached
+
+ if cached and epochfile != efile:
+ bb.debug(1, "Epoch file changed from %s to %s" % (efile, epochfile))
+
+ source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
+ try:
+ with open(epochfile, 'r') as f:
+ s = f.read()
+ try:
+ source_date_epoch = int(s)
+ except ValueError:
+ bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s)
+ source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
+ bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
+ except FileNotFoundError:
+ bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch))
+
+ d.setVar('__CACHED_SOURCE_DATE_EPOCH', (str(source_date_epoch), epochfile))
+ return str(source_date_epoch)
+
+def epochfile_write(source_date_epoch, epochfile, d):
+
+ bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
+ bb.utils.mkdirhier(os.path.dirname(epochfile))
+
+ tmp_file = "%s.new" % epochfile
+ with open(tmp_file, 'w') as f:
+ f.write(str(source_date_epoch))
+ os.rename(tmp_file, epochfile)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 4ea5adb9f4..b0dd625539 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -253,7 +253,7 @@ class Rootfs(object, metaclass=ABCMeta):
# Remove the run-postinsts package if no delayed postinsts are found
delayed_postinsts = self._get_delayed_postinsts()
if delayed_postinsts is None:
- if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")) or os.path.exists(self.d.expand("${IMAGE_ROOTFS}${systemd_unitdir}/system/run-postinsts.service")):
+ if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")) or os.path.exists(self.d.expand("${IMAGE_ROOTFS}${systemd_system_unitdir}/run-postinsts.service")):
self.pm.remove(["run-postinsts"])
image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
diff --git a/meta/lib/oe/spdx.py b/meta/lib/oe/spdx.py
index 9814fbfd66..4416194e06 100644
--- a/meta/lib/oe/spdx.py
+++ b/meta/lib/oe/spdx.py
@@ -2,6 +2,18 @@
# SPDX-License-Identifier: GPL-2.0-only
#
+#
+# This library is intended to capture the JSON SPDX specification in a type
+# safe manner. It is not intended to encode any particular OE specific
+# behaviors, see the sbom.py for that.
+#
+# The documented SPDX spec document doesn't cover the JSON syntax for
+# particular configuration, which can make it hard to determine what the JSON
+# syntax should be. I've found it is actually much simpler to read the official
+# SPDX JSON schema which can be found here: https://github.com/spdx/spdx-spec
+# in schemas/spdx-schema.json
+#
+
import hashlib
import itertools
import json
@@ -9,7 +21,16 @@ import json
SPDX_VERSION = "2.2"
+#
+# The following are the support classes that are used to implement SPDX object
+#
+
class _Property(object):
+ """
+ A generic SPDX object property. The different types will derive from this
+ class
+ """
+
def __init__(self, *, default=None):
self.default = default
@@ -19,6 +40,10 @@ class _Property(object):
class _String(_Property):
+ """
+ A scalar string property for an SPDX object
+ """
+
def __init__(self, **kwargs):
super().__init__(**kwargs)
@@ -39,6 +64,10 @@ class _String(_Property):
class _Object(_Property):
+ """
+ A scalar SPDX object property of a SPDX object
+ """
+
def __init__(self, cls, **kwargs):
super().__init__(**kwargs)
self.cls = cls
@@ -62,6 +91,10 @@ class _Object(_Property):
class _ListProperty(_Property):
+ """
+ A list of SPDX properties
+ """
+
def __init__(self, prop, **kwargs):
super().__init__(**kwargs)
self.prop = prop
@@ -82,16 +115,28 @@ class _ListProperty(_Property):
class _StringList(_ListProperty):
+ """
+ A list of strings as a property for an SPDX object
+ """
+
def __init__(self, **kwargs):
super().__init__(_String(), **kwargs)
class _ObjectList(_ListProperty):
+ """
+ A list of SPDX objects as a property for an SPDX object
+ """
+
def __init__(self, cls, **kwargs):
super().__init__(_Object(cls), **kwargs)
class MetaSPDXObject(type):
+ """
+ A metaclass that allows properties (anything derived from a _Property
+ class) to be defined for a SPDX object
+ """
def __new__(mcls, name, bases, attrs):
attrs["_properties"] = {}
@@ -105,6 +150,9 @@ class MetaSPDXObject(type):
class SPDXObject(metaclass=MetaSPDXObject):
+ """
+ The base SPDX object; all SPDX spec classes must derive from this class
+ """
def __init__(self, **d):
self._spdx = {}
@@ -122,6 +170,21 @@ class SPDXObject(metaclass=MetaSPDXObject):
return
raise KeyError("%r is not a valid SPDX property" % name)
+#
+# These are the SPDX objects implemented from the spec. The *only* properties
+# that can be added to these objects are ones directly specified in the SPDX
+# spec, however you may add helper functions to make operations easier.
+#
+# Defaults should *only* be specified if the SPDX spec says there is a certain
+# required value for a field (e.g. dataLicense), or if the field is mandatory
+# and has some sane "this field is unknown" (e.g. "NOASSERTION")
+#
+
+class SPDXAnnotation(SPDXObject):
+ annotationDate = _String()
+ annotationType = _String()
+ annotator = _String()
+ comment = _String()
class SPDXChecksum(SPDXObject):
algorithm = _String()
@@ -164,6 +227,7 @@ class SPDXPackage(SPDXObject):
packageVerificationCode = _Object(SPDXPackageVerificationCode)
hasFiles = _StringList()
packageFileName = _String()
+ annotations = _ObjectList(SPDXAnnotation)
class SPDXFile(SPDXObject):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 78cdf878f1..038404e377 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -108,7 +108,6 @@ class SignatureGeneratorOEBasicHashMixIn(object):
self.unlockedrecipes = (data.getVar("SIGGEN_UNLOCKED_RECIPES") or
"").split()
self.unlockedrecipes = { k: "" for k in self.unlockedrecipes }
- self.buildarch = data.getVar('BUILD_ARCH')
self._internal = False
pass
@@ -147,13 +146,6 @@ class SignatureGeneratorOEBasicHashMixIn(object):
self.dump_lockedsigs(sigfile)
return super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigs(dataCache, options)
- def prep_taskhash(self, tid, deps, dataCaches):
- super().prep_taskhash(tid, deps, dataCaches)
- if hasattr(self, "extramethod"):
- (mc, _, _, fn) = bb.runqueue.split_tid_mcfn(tid)
- inherits = " ".join(dataCaches[mc].inherits[fn])
- if inherits.find("/native.bbclass") != -1 or inherits.find("/cross.bbclass") != -1:
- self.extramethod[tid] = ":" + self.buildarch
def get_taskhash(self, tid, deps, dataCaches):
if tid in self.lockedhashes:
@@ -478,6 +470,8 @@ def OEOuthashBasic(path, sigfile, task, d):
import stat
import pwd
import grp
+ import re
+ import fnmatch
def update_hash(s):
s = s.encode('utf-8')
@@ -487,16 +481,29 @@ def OEOuthashBasic(path, sigfile, task, d):
h = hashlib.sha256()
prev_dir = os.getcwd()
+ corebase = d.getVar("COREBASE")
+ tmpdir = d.getVar("TMPDIR")
include_owners = os.environ.get('PSEUDO_DISABLED') == '0'
if "package_write_" in task or task == "package_qa":
include_owners = False
include_timestamps = False
+ include_root = True
if task == "package":
- include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1'
+ include_timestamps = True
+ include_root = False
extra_content = d.getVar('HASHEQUIV_HASH_VERSION')
+ filemaps = {}
+ for m in (d.getVar('SSTATE_HASHEQUIV_FILEMAP') or '').split():
+ entry = m.split(":")
+ if len(entry) != 3 or entry[0] != task:
+ continue
+ filemaps.setdefault(entry[1], [])
+ filemaps[entry[1]].append(entry[2])
+
try:
os.chdir(path)
+ basepath = os.path.normpath(path)
update_hash("OEOuthashBasic\n")
if extra_content:
@@ -545,21 +552,22 @@ def OEOuthashBasic(path, sigfile, task, d):
else:
add_perm(stat.S_IXUSR, 'x')
- add_perm(stat.S_IRGRP, 'r')
- add_perm(stat.S_IWGRP, 'w')
- if stat.S_ISGID & s.st_mode:
- add_perm(stat.S_IXGRP, 's', 'S')
- else:
- add_perm(stat.S_IXGRP, 'x')
+ if include_owners:
+ # Group/other permissions are only relevant in pseudo context
+ add_perm(stat.S_IRGRP, 'r')
+ add_perm(stat.S_IWGRP, 'w')
+ if stat.S_ISGID & s.st_mode:
+ add_perm(stat.S_IXGRP, 's', 'S')
+ else:
+ add_perm(stat.S_IXGRP, 'x')
- add_perm(stat.S_IROTH, 'r')
- add_perm(stat.S_IWOTH, 'w')
- if stat.S_ISVTX & s.st_mode:
- update_hash('t')
- else:
- add_perm(stat.S_IXOTH, 'x')
+ add_perm(stat.S_IROTH, 'r')
+ add_perm(stat.S_IWOTH, 'w')
+ if stat.S_ISVTX & s.st_mode:
+ update_hash('t')
+ else:
+ add_perm(stat.S_IXOTH, 'x')
- if include_owners:
try:
update_hash(" %10s" % pwd.getpwuid(s.st_uid).pw_name)
update_hash(" %10s" % grp.getgrgid(s.st_gid).gr_name)
@@ -578,8 +586,13 @@ def OEOuthashBasic(path, sigfile, task, d):
else:
update_hash(" " * 9)
+ filterfile = False
+ for entry in filemaps:
+ if fnmatch.fnmatch(path, entry):
+ filterfile = True
+
update_hash(" ")
- if stat.S_ISREG(s.st_mode):
+ if stat.S_ISREG(s.st_mode) and not filterfile:
update_hash("%10d" % s.st_size)
else:
update_hash(" " * 10)
@@ -588,9 +601,24 @@ def OEOuthashBasic(path, sigfile, task, d):
fh = hashlib.sha256()
if stat.S_ISREG(s.st_mode):
# Hash file contents
- with open(path, 'rb') as d:
- for chunk in iter(lambda: d.read(4096), b""):
+ if filterfile:
+ # Need to ignore paths in crossscripts and postinst-useradd files.
+ with open(path, 'rb') as d:
+ chunk = d.read()
+ chunk = chunk.replace(bytes(basepath, encoding='utf8'), b'')
+ for entry in filemaps:
+ if not fnmatch.fnmatch(path, entry):
+ continue
+ for r in filemaps[entry]:
+ if r.startswith("regex-"):
+ chunk = re.sub(bytes(r[6:], encoding='utf8'), b'', chunk)
+ else:
+ chunk = chunk.replace(bytes(r, encoding='utf8'), b'')
fh.update(chunk)
+ else:
+ with open(path, 'rb') as d:
+ for chunk in iter(lambda: d.read(4096), b""):
+ fh.update(chunk)
update_hash(fh.hexdigest())
else:
update_hash(" " * len(fh.hexdigest()))
@@ -603,7 +631,8 @@ def OEOuthashBasic(path, sigfile, task, d):
update_hash("\n")
# Process this directory and all its child files
- process(root)
+ if include_root or root != ".":
+ process(root)
for f in files:
if f == 'fixmepath':
continue
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 238af314d1..cf65639647 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -508,7 +508,8 @@ class ThreadedWorker(Thread):
try:
func(self, *args, **kargs)
except Exception as e:
- print(e)
+ # Eat all exceptions
+ bb.mainlogger.debug("Worker task raised %s" % e, exc_info=e)
finally:
self.tasks.task_done()
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 923a223b25..f956a7744f 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -44,6 +44,7 @@ class OESSHTarget(OETarget):
self.ssh = self.ssh + [ '-p', port ]
self.scp = self.scp + [ '-P', port ]
self._monitor_dumper = None
+ self.target_dumper = None
def start(self, **kwargs):
pass
@@ -102,7 +103,8 @@ class OESSHTarget(OETarget):
if self.monitor_dumper:
self.monitor_dumper.dump_monitor()
if status == 255:
- self.target_dumper.dump_target()
+ if self.target_dumper:
+ self.target_dumper.dump_target()
if self.monitor_dumper:
self.monitor_dumper.dump_monitor()
return (status, output)
diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json
index d77d0e673b..6c110d0656 100644
--- a/meta/lib/oeqa/manual/eclipse-plugin.json
+++ b/meta/lib/oeqa/manual/eclipse-plugin.json
@@ -44,7 +44,7 @@
"expected_results": ""
},
"2": {
- "action": "wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/qemu (ex:core-image-sato-sdk-qemux86-date-rootfs-tar-bz2) \nsource /opt/poky/version/environment-setup-i585-poky-linux \n\nExtract qemu with runqemu-extract-sdk /home/user/file(ex.core-image-sato-sdk-qemux86.bz2) \n/home/user/qemux86-sato-sdk \n\n",
+ "action": "wget https://downloads.yoctoproject.org/releases/yocto/yocto-$VERSION/machines/qemu/qemux86/ (ex:core-image-sato-sdk-qemux86-date-rootfs-tar-bz2) \nsource /opt/poky/version/environment-setup-i585-poky-linux \n\nExtract qemu with runqemu-extract-sdk /home/user/file(ex.core-image-sato-sdk-qemux86.bz2) \n/home/user/qemux86-sato-sdk \n\n",
"expected_results": " Qemu can be lauched normally."
},
"3": {
@@ -60,7 +60,7 @@
"expected_results": ""
},
"6": {
- "action": "(d) QEMU: \nSelect this option if you will be using the QEMU emulator. Specify the Kernel matching the QEMU architecture you are using. \n wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/bzImage-qemux86.bin \n e.g: /home/$USER/yocto/adt-installer/download_image/bzImage-qemux86.bin \n\n",
+ "action": "(d) QEMU: \nSelect this option if you will be using the QEMU emulator. Specify the Kernel matching the QEMU architecture you are using. \n wget https://downloads.yoctoproject.org/releases/yocto/yocto-$VERSION/machines/qemu/qemux86/bzImage-qemux86.bin \n e.g: /home/$USER/yocto/adt-installer/download_image/bzImage-qemux86.bin \n\n",
"expected_results": ""
},
"7": {
@@ -247,7 +247,7 @@
"execution": {
"1": {
"action": "Clone eclipse-poky source. \n \n - git clone git://git.yoctoproject.org/eclipse-poky \n\n",
- "expected_results": "Eclipse plugin is successfully installed \n\nDocumentation is there. For example if you have release yocto-2.0.1 you will found on http://autobuilder.yoctoproject.org/pub/releases/yocto-2.0.1/eclipse-plugin/mars/ archive with documentation like org.yocto.doc-development-$date.zip \n \n"
+ "expected_results": "Eclipse plugin is successfully installed \n\nDocumentation is there. For example if you have release yocto-2.0.1 you will found on https://downloads.yoctoproject.org/releases/yocto/yocto-2.0.1/eclipse-plugin/mars/ archive with documentation like org.yocto.doc-development-$date.zip \n \n"
},
"2": {
"action": "Checkout correct tag. \n\n - git checkout <eclipse-version>/<yocto-version> \n\n",
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py
index 7a9d62c003..a4339116bf 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -116,12 +116,12 @@ class RpmInstallRemoveTest(OERuntimeTestCase):
Author: Alexander Kanavin <alex.kanavin@gmail.com>
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
- db_files_cmd = 'ls /var/lib/rpm/__db.*'
+ db_files_cmd = 'ls /var/lib/rpm/rpmdb.sqlite*'
check_log_cmd = "grep RPM /var/log/messages | wc -l"
- # Make sure that some database files are under /var/lib/rpm as '__db.xxx'
+ # Make sure that some database files are under /var/lib/rpm as 'rpmdb.sqlite'
status, output = self.target.run(db_files_cmd)
- msg = 'Failed to find database files under /var/lib/rpm/ as __db.xxx'
+ msg = 'Failed to find database files under /var/lib/rpm/ as rpmdb.sqlite'
self.assertEqual(0, status, msg=msg)
self.tc.target.copyTo(self.test_file, self.dst)
diff --git a/meta/lib/oeqa/sdk/buildtools-cases/build.py b/meta/lib/oeqa/sdk/buildtools-cases/build.py
index 9c9a84bf8a..aee2e5a8c0 100644
--- a/meta/lib/oeqa/sdk/buildtools-cases/build.py
+++ b/meta/lib/oeqa/sdk/buildtools-cases/build.py
@@ -25,6 +25,6 @@ class BuildTests(OESDKTestCase):
self._run('. %s/oe-init-build-env %s && bitbake virtual/libc' % (corebase, testdir))
finally:
delay = 10
- while delay and os.path.exists(testdir + "/bitbake.lock"):
+ while delay and (os.path.exists(testdir + "/bitbake.lock") or os.path.exists(testdir + "/cache/hashserv.db-wal")):
time.sleep(1)
delay = delay - 1
diff --git a/meta/lib/oeqa/selftest/cases/bblogging.py b/meta/lib/oeqa/selftest/cases/bblogging.py
new file mode 100644
index 0000000000..ea6c3c8c77
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/bblogging.py
@@ -0,0 +1,104 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import bitbake
+
+class BitBakeLogging(OESelftestTestCase):
+
+ def assertCount(self, item, entry, count):
+ self.assertEqual(item.count(entry), count, msg="Output:\n'''\n%s\n'''\ndoesn't contain %d copies of:\n'''\n%s\n'''\n" % (item, count, entry))
+
+ def test_shell_logging(self):
+ # no logs, no verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c shelltest -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ self.assertNotIn("This is shell stdout", result.output)
+ self.assertNotIn("This is shell stderr", result.output)
+
+ # logs, no verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c shelltest -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ self.assertCount(result.output, "This is shell stdout", 1)
+ self.assertCount(result.output, "This is shell stderr", 1)
+
+ # no logs, verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c shelltest -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # two copies due to set +x
+ self.assertCount(result.output, "This is shell stdout", 2)
+ self.assertCount(result.output, "This is shell stderr", 2)
+
+ # logs, verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c shelltest -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # two copies due to set +x
+ self.assertCount(result.output, "This is shell stdout", 2)
+ self.assertCount(result.output, "This is shell stderr", 2)
+
+ def test_python_exit_logging(self):
+ # no logs, no verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c pythontest_exit -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ self.assertNotIn("This is python stdout", result.output)
+
+ # logs, no verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c pythontest_exit -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # A sys.exit() should include the output
+ self.assertCount(result.output, "This is python stdout", 1)
+
+ # no logs, verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # python tasks don't log output with -v currently
+ #self.assertCount(result.output, "This is python stdout", 1)
+
+ # logs, verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # python tasks don't log output with -v currently
+ #self.assertCount(result.output, "This is python stdout", 1)
+
+ def test_python_fatal_logging(self):
+ # no logs, no verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c pythontest_fatal -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ self.assertNotIn("This is python fatal test stdout", result.output)
+ self.assertCount(result.output, "This is a fatal error", 1)
+
+ # logs, no verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c pythontest_fatal -f", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # A bb.fatal() should not include the output
+ self.assertNotIn("This is python fatal test stdout", result.output)
+ self.assertCount(result.output, "This is a fatal error", 1)
+
+ # no logs, verbose
+ self.write_config('BBINCLUDELOGS = ""')
+ result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # python tasks don't log output with -v currently
+ #self.assertCount(result.output, "This is python fatal test stdout", 1)
+ self.assertCount(result.output, "This is a fatal error", 1)
+
+ # logs, verbose
+ self.write_config('BBINCLUDELOGS = "yes"')
+ result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True)
+ self.assertIn("ERROR: Logfile of failure stored in:", result.output)
+ # python tasks don't log output with -v currently
+ #self.assertCount(result.output, "This is python fatal test stdout", 1)
+ self.assertCount(result.output, "This is a fatal error", 1)
+
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index 8831de6065..6779e62103 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -83,8 +83,10 @@ class BitbakeTests(OESelftestTestCase):
def test_force_task_1(self):
# test 1 from bug 5875
+ import uuid
test_recipe = 'zlib'
- test_data = "Microsoft Made No Profit From Anyone's Zunes Yo"
+ # Need to use uuid otherwise hash equivlance would change the workflow
+ test_data = "Microsoft Made No Profit From Anyone's Zunes Yo %s" % uuid.uuid1()
bb_vars = get_bb_vars(['D', 'PKGDEST', 'mandir'], test_recipe)
image_dir = bb_vars['D']
pkgsplit_dir = bb_vars['PKGDEST']
@@ -149,9 +151,6 @@ INHERIT:remove = \"report-error\"
self.delete_recipeinc('man-db')
self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output)
self.assertIn('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:', result.output)
- line = self.getline(result, 'Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.')
- self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \
-doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output)
def test_rename_downloaded_file(self):
# TODO unique dldir instead of using cleanall
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 6d9cd46bf3..f495e84c79 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -649,7 +649,7 @@ class DevtoolModifyTests(DevtoolBase):
self.track_for_cleanup(self.workspacedir)
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
- testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split()
+ testrecipes = 'perf kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk'.split()
# Find actual name of gcc-source since it now includes the version - crude, but good enough for this purpose
result = runCmd('bitbake-layers show-recipes gcc-source*')
for line in result.output.splitlines():
diff --git a/meta/lib/oeqa/selftest/cases/eSDK.py b/meta/lib/oeqa/selftest/cases/eSDK.py
index 862849af35..d0c402ba8a 100644
--- a/meta/lib/oeqa/selftest/cases/eSDK.py
+++ b/meta/lib/oeqa/selftest/cases/eSDK.py
@@ -100,7 +100,7 @@ SSTATE_MIRRORS = "file://.* file://%s/PATH"
@classmethod
def tearDownClass(cls):
for i in range(0, 10):
- if os.path.exists(os.path.join(cls.tmpdir_eSDKQA, 'bitbake.lock')):
+ if os.path.exists(os.path.join(cls.tmpdir_eSDKQA, 'bitbake.lock')) or os.path.exists(os.path.join(cls.tmpdir_eSDKQA, 'cache/hashserv.db-wal')):
time.sleep(1)
else:
break
diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py b/meta/lib/oeqa/selftest/cases/fitimage.py
index 184c8778d2..f6f6a8e795 100644
--- a/meta/lib/oeqa/selftest/cases/fitimage.py
+++ b/meta/lib/oeqa/selftest/cases/fitimage.py
@@ -742,6 +742,7 @@ UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000"
UBOOT_EXTLINUX = "0"
FIT_GENERATE_KEYS = "1"
KERNEL_IMAGETYPE_REPLACEMENT = "zImage"
+FIT_KERNEL_COMP_ALG = "none"
FIT_HASH_ALG = "sha256"
"""
self.write_config(config)
@@ -763,9 +764,8 @@ FIT_HASH_ALG = "sha256"
kernel_load = str(get_bb_var('UBOOT_LOADADDRESS'))
kernel_entry = str(get_bb_var('UBOOT_ENTRYPOINT'))
- initramfs_bundle_format = str(get_bb_var('KERNEL_IMAGETYPE_REPLACEMENT'))
+ kernel_compression = str(get_bb_var('FIT_KERNEL_COMP_ALG'))
uboot_arch = str(get_bb_var('UBOOT_ARCH'))
- initramfs_bundle = "arch/" + uboot_arch + "/boot/" + initramfs_bundle_format + ".initramfs"
fit_hash_alg = str(get_bb_var('FIT_HASH_ALG'))
its_file = open(fitimage_its_path)
@@ -775,11 +775,11 @@ FIT_HASH_ALG = "sha256"
exp_node_lines = [
'kernel-1 {',
'description = "Linux kernel";',
- 'data = /incbin/("' + initramfs_bundle + '");',
+ 'data = /incbin/("linux.bin");',
'type = "kernel";',
'arch = "' + uboot_arch + '";',
'os = "linux";',
- 'compression = "none";',
+ 'compression = "' + kernel_compression + '";',
'load = <' + kernel_load + '>;',
'entry = <' + kernel_entry + '>;',
'hash-1 {',
diff --git a/meta/lib/oeqa/selftest/cases/gotoolchain.py b/meta/lib/oeqa/selftest/cases/gotoolchain.py
index 4fc3605f42..c809d7c9b1 100644
--- a/meta/lib/oeqa/selftest/cases/gotoolchain.py
+++ b/meta/lib/oeqa/selftest/cases/gotoolchain.py
@@ -43,6 +43,12 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
@classmethod
def tearDownClass(cls):
+ # Go creates file which are readonly
+ for dirpath, dirnames, filenames in os.walk(cls.tmpdir_SDKQA):
+ for filename in filenames + dirnames:
+ f = os.path.join(dirpath, filename)
+ if not os.path.islink(f):
+ os.chmod(f, 0o775)
shutil.rmtree(cls.tmpdir_SDKQA, ignore_errors=True)
super(oeGoToolchainSelfTest, cls).tearDownClass()
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index 8a10ff357b..91abf9654a 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -150,7 +150,7 @@ class OEListPackageconfigTests(OEScriptTests):
expected_endlines = []
expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS")
expected_endlines.append("pinentry gtk2 libcap ncurses qt secret")
- expected_endlines.append("tar acl")
+ expected_endlines.append("tar acl selinux")
self.check_endlines(results, expected_endlines)
@@ -167,7 +167,7 @@ class OEListPackageconfigTests(OEScriptTests):
def test_packageconfig_flags_option_all(self):
results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir)
expected_endlines = []
- expected_endlines.append("pinentry-1.1.1")
+ expected_endlines.append("pinentry-1.2.0")
expected_endlines.append("PACKAGECONFIG ncurses libcap")
expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase")
expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index e4582cb82a..8061bf21c9 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -25,8 +25,6 @@ import datetime
# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20201203-sua0pzvc/
# (both packages/ and packages-excluded/)
-# ruby-ri-docs, meson:
-#https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210215-0_td9la2/packages/diff-html/
# rust-llvm:
#https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210825-kaihham6/
exclude_packages = [
@@ -35,7 +33,6 @@ exclude_packages = [
'go-runtime',
'go_',
'go-',
- 'ruby-ri-docs',
'rust-llvm-liblto',
'rust-llvm-staticdev'
]
@@ -219,7 +216,6 @@ class ReproducibleTests(OESelftestTestCase):
bb.utils.remove(tmpdir, recurse=True)
config = textwrap.dedent('''\
- INHERIT += "reproducible_build"
PACKAGE_CLASSES = "{package_classes}"
INHIBIT_PACKAGE_STRIP = "1"
TMPDIR = "{tmpdir}"
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index af7a0b8b45..6f3d4aeae9 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -159,13 +159,13 @@ class Signing(OESelftestTestCase):
bitbake('-c clean %s' % test_recipe)
bitbake('-c populate_lic %s' % test_recipe)
- recipe_sig = glob.glob(sstatedir + '/*/*/*:ed:*_populate_lic.tgz.sig')
- recipe_tgz = glob.glob(sstatedir + '/*/*/*:ed:*_populate_lic.tgz')
+ recipe_sig = glob.glob(sstatedir + '/*/*/*:ed:*_populate_lic.tar.zst.sig')
+ recipe_archive = glob.glob(sstatedir + '/*/*/*:ed:*_populate_lic.tar.zst')
self.assertEqual(len(recipe_sig), 1, 'Failed to find .sig file.')
- self.assertEqual(len(recipe_tgz), 1, 'Failed to find .tgz file.')
+ self.assertEqual(len(recipe_archive), 1, 'Failed to find .tar.zst file.')
- ret = runCmd('gpg --homedir %s --verify %s %s' % (self.gpg_dir, recipe_sig[0], recipe_tgz[0]))
+ ret = runCmd('gpg --homedir %s --verify %s %s' % (self.gpg_dir, recipe_sig[0], recipe_archive[0]))
# gpg: Signature made Thu 22 Oct 2015 01:45:09 PM EEST using RSA key ID 61EEFB30
# gpg: Good signature from "testuser (nocomment) <testuser@email.com>"
self.assertIn('gpg: Good signature from', ret.output, 'Package signed incorrectly.')
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 17a1545506..3dab607eeb 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -68,7 +68,7 @@ class SStateTests(SStateBase):
results = self.search_sstate('|'.join(map(str, targets)), distro_specific, distro_nonspecific)
if distro_nonspecific:
for r in results:
- if r.endswith(("_populate_lic.tgz", "_populate_lic.tgz.siginfo", "_fetch.tgz.siginfo", "_unpack.tgz.siginfo", "_patch.tgz.siginfo")):
+ if r.endswith(("_populate_lic.tar.zst", "_populate_lic.tar.zst.siginfo", "_fetch.tar.zst.siginfo", "_unpack.tar.zst.siginfo", "_patch.tar.zst.siginfo")):
continue
file_tracker.append(r)
else:
@@ -98,15 +98,15 @@ class SStateTests(SStateBase):
bitbake(['-ccleansstate'] + targets)
bitbake(targets)
- tgz_created = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific)
- self.assertTrue(tgz_created, msg="Could not find sstate .tgz files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_created)))
+ archives_created = self.search_sstate('|'.join(map(str, [s + r'.*?\.tar.zst$' for s in targets])), distro_specific, distro_nonspecific)
+ self.assertTrue(archives_created, msg="Could not find sstate .tar.zst files for: %s (%s)" % (', '.join(map(str, targets)), str(archives_created)))
siginfo_created = self.search_sstate('|'.join(map(str, [s + r'.*?\.siginfo$' for s in targets])), distro_specific, distro_nonspecific)
self.assertTrue(siginfo_created, msg="Could not find sstate .siginfo files for: %s (%s)" % (', '.join(map(str, targets)), str(siginfo_created)))
bitbake(['-ccleansstate'] + targets)
- tgz_removed = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific, distro_nonspecific)
- self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(tgz_removed)))
+ archives_removed = self.search_sstate('|'.join(map(str, [s + r'.*?\.tar.zst$' for s in targets])), distro_specific, distro_nonspecific)
+ self.assertTrue(not archives_removed, msg="do_cleansstate didn't remove .tar.zst sstate files for: %s (%s)" % (', '.join(map(str, targets)), str(archives_removed)))
def test_cleansstate_task_distro_specific_nonspecific(self):
targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
@@ -129,15 +129,15 @@ class SStateTests(SStateBase):
bitbake(['-ccleansstate'] + targets)
bitbake(targets)
- results = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=False, distro_nonspecific=True)
+ results = self.search_sstate('|'.join(map(str, [s + r'.*?\.tar.zst$' for s in targets])), distro_specific=False, distro_nonspecific=True)
filtered_results = []
for r in results:
- if r.endswith(("_populate_lic.tgz", "_populate_lic.tgz.siginfo")):
+ if r.endswith(("_populate_lic.tar.zst", "_populate_lic.tar.zst.siginfo")):
continue
filtered_results.append(r)
self.assertTrue(filtered_results == [], msg="Found distro non-specific sstate for: %s (%s)" % (', '.join(map(str, targets)), str(filtered_results)))
- file_tracker_1 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
- self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+ file_tracker_1 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tar.zst$' for s in targets])), distro_specific=True, distro_nonspecific=False)
+ self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
self.track_for_cleanup(self.distro_specific_sstate + "_old")
shutil.copytree(self.distro_specific_sstate, self.distro_specific_sstate + "_old")
@@ -145,14 +145,14 @@ class SStateTests(SStateBase):
bitbake(['-cclean'] + targets)
bitbake(targets)
- file_tracker_2 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
- self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+ file_tracker_2 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tar.zst$' for s in targets])), distro_specific=True, distro_nonspecific=False)
+ self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
not_recreated = [x for x in file_tracker_1 if x not in file_tracker_2]
- self.assertTrue(not_recreated == [], msg="The following sstate files ware not recreated: %s" % ', '.join(map(str, not_recreated)))
+ self.assertTrue(not_recreated == [], msg="The following sstate files were not recreated: %s" % ', '.join(map(str, not_recreated)))
created_once = [x for x in file_tracker_2 if x not in file_tracker_1]
- self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once)))
+ self.assertTrue(created_once == [], msg="The following sstate files were created only in the second run: %s" % ', '.join(map(str, created_once)))
def test_rebuild_distro_specific_sstate_cross_native_targets(self):
self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch, 'binutils-native'], temp_sstate_location=True)
@@ -188,23 +188,23 @@ class SStateTests(SStateBase):
if not sstate_arch in sstate_archs_list:
sstate_archs_list.append(sstate_arch)
if target_config[idx] == target_config[-1]:
- target_sstate_before_build = self.search_sstate(target + r'.*?\.tgz$')
+ target_sstate_before_build = self.search_sstate(target + r'.*?\.tar.zst$')
bitbake("-cclean %s" % target)
result = bitbake(target, ignore_status=True)
if target_config[idx] == target_config[-1]:
- target_sstate_after_build = self.search_sstate(target + r'.*?\.tgz$')
+ target_sstate_after_build = self.search_sstate(target + r'.*?\.tar.zst$')
expected_remaining_sstate += [x for x in target_sstate_after_build if x not in target_sstate_before_build if not any(pattern in x for pattern in ignore_patterns)]
self.remove_config(global_config[idx])
self.remove_recipeinc(target, target_config[idx])
self.assertEqual(result.status, 0, msg = "build of %s failed with %s" % (target, result.output))
runCmd("sstate-cache-management.sh -y --cache-dir=%s --remove-duplicated --extra-archs=%s" % (self.sstate_path, ','.join(map(str, sstate_archs_list))))
- actual_remaining_sstate = [x for x in self.search_sstate(target + r'.*?\.tgz$') if not any(pattern in x for pattern in ignore_patterns)]
+ actual_remaining_sstate = [x for x in self.search_sstate(target + r'.*?\.tar.zst$') if not any(pattern in x for pattern in ignore_patterns)]
actual_not_expected = [x for x in actual_remaining_sstate if x not in expected_remaining_sstate]
- self.assertFalse(actual_not_expected, msg="Files should have been removed but ware not: %s" % ', '.join(map(str, actual_not_expected)))
+ self.assertFalse(actual_not_expected, msg="Files should have been removed but were not: %s" % ', '.join(map(str, actual_not_expected)))
expected_not_actual = [x for x in expected_remaining_sstate if x not in actual_remaining_sstate]
- self.assertFalse(expected_not_actual, msg="Extra files ware removed: %s" ', '.join(map(str, expected_not_actual)))
+ self.assertFalse(expected_not_actual, msg="Extra files were removed: %s" ', '.join(map(str, expected_not_actual)))
def test_sstate_cache_management_script_using_pr_1(self):
global_config = []
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py
index 51092805d8..8fd48bb054 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -94,14 +94,13 @@ class TinfoilTests(OESelftestTestCase):
pass
pattern = 'conf'
- res = tinfoil.run_command('findFilesMatchingInDir', pattern, 'conf/machine')
+ res = tinfoil.run_command('testCookerCommandEvent', pattern)
self.assertTrue(res)
eventreceived = False
commandcomplete = False
start = time.time()
# Wait for maximum 60s in total so we'd detect spurious heartbeat events for example
- # The test is IO load sensitive too
while (not (eventreceived == True and commandcomplete == True)
and (time.time() - start < 60)):
# if we received both events (on let's say a good day), we are done
@@ -111,7 +110,8 @@ class TinfoilTests(OESelftestTestCase):
commandcomplete = True
elif isinstance(event, bb.event.FilesMatchingFound):
self.assertEqual(pattern, event._pattern)
- self.assertIn('qemuarm.conf', event._matches)
+ self.assertIn('A', event._matches)
+ self.assertIn('B', event._matches)
eventreceived = True
elif isinstance(event, logging.LogRecord):
continue
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index dc7b9e637e..5fc8e65142 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1158,6 +1158,35 @@ class Wic2(WicTestCase):
out = glob(self.resultdir + "%s-*.direct" % wksname)
self.assertEqual(1, len(out))
+ @only_for_arch(['i586', 'i686', 'x86_64'])
+ def test_efi_plugin_unified_kernel_image_qemu(self):
+ """Test efi plugin's Unified Kernel Image feature in qemu"""
+ config = 'IMAGE_FSTYPES = "wic"\n'\
+ 'INITRAMFS_IMAGE = "core-image-minimal-initramfs"\n'\
+ 'WKS_FILE = "test_efi_plugin.wks"\n'\
+ 'MACHINE_FEATURES:append = " efi"\n'
+ self.append_config(config)
+ self.assertEqual(0, bitbake('core-image-minimal core-image-minimal-initramfs ovmf').status)
+ self.remove_config(config)
+
+ with runqemu('core-image-minimal', ssh=False,
+ runqemuparams='ovmf', image_fstype='wic') as qemu:
+ # Check that /boot has EFI bootx64.efi (required for EFI)
+ cmd = "ls /boot/EFI/BOOT/bootx64.efi | wc -l"
+ status, output = qemu.run_serial(cmd)
+ self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
+ self.assertEqual(output, '1')
+ # Check that /boot has EFI/Linux/linux.efi (required for Unified Kernel Images auto detection)
+ cmd = "ls /boot/EFI/Linux/linux.efi | wc -l"
+ status, output = qemu.run_serial(cmd)
+ self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))
+ self.assertEqual(output, '1')
+ # Check that /boot doesn't have loader/entries/boot.conf (Unified Kernel Images are auto detected by the bootloader)
+ cmd = "ls /boot/loader/entries/boot.conf 2&>/dev/null | w