summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/conf/bitbake.conf17
-rw-r--r--meta/conf/distro/include/cve-extra-exclusions.inc75
-rw-r--r--meta/conf/distro/include/default-distrovars.inc4
-rw-r--r--meta/conf/distro/include/maintainers.inc51
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc2
-rw-r--r--meta/conf/distro/include/yocto-uninative.inc11
-rw-r--r--meta/conf/layer.conf2
-rw-r--r--meta/conf/licenses.conf15
-rw-r--r--meta/conf/multilib.conf2
10 files changed, 141 insertions, 40 deletions
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 251d43bb21..35faef9a36 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "14"
12# a reset of the equivalence, for example when reproducibility issues break the 12# a reset of the equivalence, for example when reproducibility issues break the
13# existing match data. Distros can also append to this value for the same effect. 13# existing match data. Distros can also append to this value for the same effect.
14# 14#
15HASHEQUIV_HASH_VERSION = "4" 15HASHEQUIV_HASH_VERSION = "5"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6ada0099eb..457b7790c2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -421,8 +421,10 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
421 421
422SDK_NAME_PREFIX ?= "oecore" 422SDK_NAME_PREFIX ?= "oecore"
423SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}" 423SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}"
424SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}" 424SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath"
425SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" 425SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
426# The path to default to installing the SDK to
427SDKPATHINSTALL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
426 428
427################################################################## 429##################################################################
428# Kernel info. 430# Kernel info.
@@ -480,7 +482,7 @@ export PATH
480# Build utility info. 482# Build utility info.
481################################################################## 483##################################################################
482 484
483# Directory where host tools are copied 485# Directory with symlinks to host tools used by build
484HOSTTOOLS_DIR = "${TMPDIR}/hosttools" 486HOSTTOOLS_DIR = "${TMPDIR}/hosttools"
485 487
486# Tools needed to run builds with OE-Core 488# Tools needed to run builds with OE-Core
@@ -500,7 +502,7 @@ HOSTTOOLS += " \
500HOSTTOOLS += "${@'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 ''}" 502HOSTTOOLS += "${@'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 ''}"
501 503
502# Link to these if present 504# Link to these if present
503HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" 505HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo"
504 506
505# Temporary add few more detected in bitbake world 507# Temporary add few more detected in bitbake world
506HOSTTOOLS_NONFATAL += "join nl size yes zcat" 508HOSTTOOLS_NONFATAL += "join nl size yes zcat"
@@ -639,7 +641,7 @@ APACHE_MIRROR = "https://archive.apache.org/dist"
639DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool" 641DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool"
640GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" 642GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
641GNOME_GIT = "git://gitlab.gnome.org/GNOME" 643GNOME_GIT = "git://gitlab.gnome.org/GNOME"
642GNOME_MIRROR = "https://ftp.gnome.org/pub/GNOME/sources" 644GNOME_MIRROR = "https://download.gnome.org/sources/"
643GNU_MIRROR = "https://ftp.gnu.org/gnu" 645GNU_MIRROR = "https://ftp.gnu.org/gnu"
644GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt" 646GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt"
645GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" 647GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
@@ -687,7 +689,10 @@ SRC_URI = ""
687PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 689PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
688PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" 690PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
689PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" 691PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native"
690PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" 692PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR}"
693PSEUDO_IGNORE_PATHS .= ",${TMPDIR}/sstate-control,${TMPDIR}/buildstats,${TMPDIR}/sysroots-components,${TMPDIR}/pkgdata"
694PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/deploy-,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/pkgdata-sysroot"
695PSEUDO_IGNORE_PATHS .= ",${DEPLOY_DIR},${BUILDHISTORY_DIR},${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}"
691 696
692export PSEUDO_DISABLED = "1" 697export PSEUDO_DISABLED = "1"
693#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" 698#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
@@ -892,7 +897,7 @@ BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \
892 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ 897 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
893 GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ 898 GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \
894 HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ 899 HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \
895 BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT" 900 BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT BB_NICE_LEVEL"
896BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ 901BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \
897 lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ 902 lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \
898 file-checksums python func task export unexport noexec nostamp dirs cleandirs \ 903 file-checksums python func task export unexport noexec nostamp dirs cleandirs \
diff --git a/meta/conf/distro/include/cve-extra-exclusions.inc b/meta/conf/distro/include/cve-extra-exclusions.inc
new file mode 100644
index 0000000000..f3490db9dd
--- /dev/null
+++ b/meta/conf/distro/include/cve-extra-exclusions.inc
@@ -0,0 +1,75 @@
1# This file contains a list of CVE's where resolution has proven to be impractical
2# or there is no reasonable action the Yocto Project can take to resolve the issue.
3# It contains all the information we are aware of about an issue and analysis about
4# why we believe it can't be fixed/handled. Additional information is welcome through
5# patches to the file.
6#
7# Include this file in your local.conf or distro.conf to exclude these CVE's
8# from the cve-check results or add to the bitbake command with:
9# -R conf/distro/include/cve-extra-exclusions.inc
10#
11# The file is not included by default since users should review this data to ensure
12# it matches their expectations and usage of the project.
13#
14# We may also include "in-flight" information about current/ongoing CVE work with
15# the aim of sharing that work and ensuring we don't duplicate it.
16#
17
18
19# strace https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2000-0006
20# CVE is more than 20 years old with no resolution evident
21# broken links in CVE database references make resolution impractical
22CVE_CHECK_WHITELIST += "CVE-2000-0006"
23
24# epiphany https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-0238
25# The issue here is spoofing of domain names using characters from other character sets.
26# There has been much discussion amongst the epiphany and webkit developers and
27# whilst there are improvements about how domains are handled and displayed to the user
28# there is unlikely ever to be a single fix to webkit or epiphany which addresses this
29# problem. Whitelisted as there isn't any mitigation or fix or way to progress this further
30# we can seem to take.
31CVE_CHECK_WHITELIST += "CVE-2005-0238"
32
33# glibc https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4756
34# Issue is memory exhaustion via glob() calls, e.g. from within an ftp server
35# Best discussion in https://bugzilla.redhat.com/show_bug.cgi?id=681681
36# Upstream don't see it as a security issue, ftp servers shouldn't be passing
37# this to libc glob. Exclude as upstream have no plans to add BSD's GLOB_LIMIT or similar
38CVE_CHECK_WHITELIST += "CVE-2010-4756"
39
40# go https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29509
41# go https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-29511
42# The encoding/xml package in go can potentially be used for security exploits if not used correctly
43# CVE applies to a netapp product as well as flagging a general issue. We don't ship anything
44# exposing this interface in an exploitable way
45CVE_CHECK_WHITELIST += "CVE-2020-29509 CVE-2020-29511"
46
47# db
48# Since Oracle relicensed bdb, the open source community is slowly but surely replacing bdb with
49# supported and open source friendly alternatives. As a result these CVEs are unlikely to ever be fixed.
50CVE_CHECK_WHITELIST += "CVE-2015-2583 CVE-2015-2624 CVE-2015-2626 CVE-2015-2640 CVE-2015-2654 \
51CVE-2015-2656 CVE-2015-4754 CVE-2015-4764 CVE-2015-4774 CVE-2015-4775 CVE-2015-4776 CVE-2015-4777 \
52CVE-2015-4778 CVE-2015-4779 CVE-2015-4780 CVE-2015-4781 CVE-2015-4782 CVE-2015-4783 CVE-2015-4784 \
53CVE-2015-4785 CVE-2015-4786 CVE-2015-4787 CVE-2015-4788 CVE-2015-4789 CVE-2015-4790 CVE-2016-0682 \
54CVE-2016-0689 CVE-2016-0692 CVE-2016-0694 CVE-2016-3418 CVE-2020-2981"
55
56# qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255
57# There was a proposed patch https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg06098.html
58# qemu maintainers say the patch is incorrect and should not be applied
59# Ignore from OE's perspectivee as the issue is of low impact, at worst sitting in an infinite loop rather than exploitable
60CVE_CHECK_WHITELIST += "CVE-2021-20255"
61
62# qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067
63# There was a proposed patch but rejected by upstream qemu. It is unclear if the issue can
64# still be reproduced or where exactly any bug is.
65# Ignore from OE's perspective as we'll pick up any fix when upstream accepts one.
66CVE_CHECK_WHITELIST += "CVE-2019-12067"
67
68# nasm:nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974
69# It is a fuzzing related buffer overflow. It is of low impact since most devices
70# wouldn't expose an assembler. The upstream is inactive and there is little to be
71# done about the bug, ignore from an OE perspective.
72CVE_CHECK_WHITELIST += "CVE-2020-18974"
73
74
75
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 433d4b6651..038acc1504 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -47,5 +47,5 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}"
47# The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully 47# The CONNECTIVITY_CHECK_URIS are used to test whether we can succesfully
48# fetch from the network (and warn you if not). To disable the test set 48# fetch from the network (and warn you if not). To disable the test set
49# the variable to be empty. 49# the variable to be empty.
50# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master 50# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master;branch=master
51CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" 51CONNECTIVITY_CHECK_URIS ?= "https://yoctoproject.org/connectivity.html"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index ff962a3be9..11a35a2c59 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -4,7 +4,7 @@
4# 4#
5# Please submit any patches against recipes in meta to the 5# Please submit any patches against recipes in meta to the
6# OE-Core mail list (openembedded-core@lists.openembedded.org) 6# OE-Core mail list (openembedded-core@lists.openembedded.org)
7# For recipes in meta-yocto please use the Poky list (poky@yoctoproject.org) 7# For recipes in meta-yocto please use the Poky list (poky@lists.yoctoproject.org)
8# 8#
9# If you have problems with or questions about a particular recipe, feel 9# If you have problems with or questions about a particular recipe, feel
10# free to contact the maintainer directly (cc:ing the appropriate mailing list 10# free to contact the maintainer directly (cc:ing the appropriate mailing list
@@ -88,8 +88,8 @@ RECIPE_MAINTAINER_pn-builder = "Richard Purdie <richard.purdie@linuxfoundation.o
88RECIPE_MAINTAINER_pn-buildtools-extended-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" 88RECIPE_MAINTAINER_pn-buildtools-extended-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>"
89RECIPE_MAINTAINER_pn-buildtools-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" 89RECIPE_MAINTAINER_pn-buildtools-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>"
90RECIPE_MAINTAINER_pn-busybox = "Andrej Valek <andrej.valek@siemens.com>" 90RECIPE_MAINTAINER_pn-busybox = "Andrej Valek <andrej.valek@siemens.com>"
91RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <denys@ti.com>" 91RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko <denys@denix.org>"
92RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <denys@ti.com>" 92RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko <denys@denix.org>"
93RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin <alex.kanavin@gmail.com>" 93RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin <alex.kanavin@gmail.com>"
94RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>" 94RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>"
95RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" 95RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>"
@@ -125,7 +125,7 @@ RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linux
125RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" 125RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>"
126RECIPE_MAINTAINER_pn-core-image-sato-sdk-ptest = "Richard Purdie <richard.purdie@linuxfoundation.org>" 126RECIPE_MAINTAINER_pn-core-image-sato-sdk-ptest = "Richard Purdie <richard.purdie@linuxfoundation.org>"
127RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>" 127RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>"
128RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denys@ti.com>" 128RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denys@denix.org>"
129RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <akuster808@gmail.com>" 129RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <akuster808@gmail.com>"
130RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <alex.kanavin@gmail.com>" 130RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <alex.kanavin@gmail.com>"
131RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal <anuj.mittal@intel.com>" 131RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -194,7 +194,7 @@ RECIPE_MAINTAINER_pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r
194RECIPE_MAINTAINER_pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" 194RECIPE_MAINTAINER_pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
195RECIPE_MAINTAINER_pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>" 195RECIPE_MAINTAINER_pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
196RECIPE_MAINTAINER_pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" 196RECIPE_MAINTAINER_pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
197RECIPE_MAINTAINER_pn-gcc-source-9.3.0 = "Khem Raj <raj.khem@gmail.com>" 197RECIPE_MAINTAINER_pn-gcc-source-9.5.0 = "Khem Raj <raj.khem@gmail.com>"
198RECIPE_MAINTAINER_pn-gconf = "Ross Burton <ross.burton@arm.com>" 198RECIPE_MAINTAINER_pn-gconf = "Ross Burton <ross.burton@arm.com>"
199RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" 199RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
200RECIPE_MAINTAINER_pn-gdb = "Khem Raj <raj.khem@gmail.com>" 200RECIPE_MAINTAINER_pn-gdb = "Khem Raj <raj.khem@gmail.com>"
@@ -233,7 +233,7 @@ RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin <alex.kanavin@gm
233RECIPE_MAINTAINER_pn-gperf = "Alexander Kanavin <alex.kanavin@gmail.com>" 233RECIPE_MAINTAINER_pn-gperf = "Alexander Kanavin <alex.kanavin@gmail.com>"
234RECIPE_MAINTAINER_pn-gpgme = "Hongxu Jia <hongxu.jia@windriver.com>" 234RECIPE_MAINTAINER_pn-gpgme = "Hongxu Jia <hongxu.jia@windriver.com>"
235RECIPE_MAINTAINER_pn-gptfdisk = "Alexander Kanavin <alex.kanavin@gmail.com>" 235RECIPE_MAINTAINER_pn-gptfdisk = "Alexander Kanavin <alex.kanavin@gmail.com>"
236RECIPE_MAINTAINER_pn-grep = "Denys Dmytriyenko <denys@ti.com>" 236RECIPE_MAINTAINER_pn-grep = "Denys Dmytriyenko <denys@denix.org>"
237RECIPE_MAINTAINER_pn-groff = "Hongxu Jia <hongxu.jia@windriver.com>" 237RECIPE_MAINTAINER_pn-groff = "Hongxu Jia <hongxu.jia@windriver.com>"
238RECIPE_MAINTAINER_pn-grub = "Anuj Mittal <anuj.mittal@intel.com>" 238RECIPE_MAINTAINER_pn-grub = "Anuj Mittal <anuj.mittal@intel.com>"
239RECIPE_MAINTAINER_pn-grub-bootconf = "Anuj Mittal <anuj.mittal@intel.com>" 239RECIPE_MAINTAINER_pn-grub-bootconf = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -254,9 +254,9 @@ RECIPE_MAINTAINER_pn-gstreamer1.0-rtsp-server = "Anuj Mittal <anuj.mittal@intel.
254RECIPE_MAINTAINER_pn-gstreamer1.0-vaapi = "Anuj Mittal <anuj.mittal@intel.com>" 254RECIPE_MAINTAINER_pn-gstreamer1.0-vaapi = "Anuj Mittal <anuj.mittal@intel.com>"
255RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <ross.burton@arm.com>" 255RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <ross.burton@arm.com>"
256RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <alex.kanavin@gmail.com>" 256RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <alex.kanavin@gmail.com>"
257RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@ti.com>" 257RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <denys@denix.org>"
258RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>" 258RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <anuj.mittal@intel.com>"
259RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@ti.com>" 259RECIPE_MAINTAINER_pn-hdparm = "Denys Dmytriyenko <denys@denix.org>"
260RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>" 260RECIPE_MAINTAINER_pn-help2man-native = "Hongxu Jia <hongxu.jia@windriver.com>"
261RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>" 261RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Anuj Mittal <anuj.mittal@intel.com>"
262RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>" 262RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin <alex.kanavin@gmail.com>"
@@ -454,10 +454,10 @@ RECIPE_MAINTAINER_pn-ltp = "Yi Zhao <yi.zhao@windriver.com>"
454RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie <richard.purdie@linuxfoundation.org>" 454RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie <richard.purdie@linuxfoundation.org>"
455RECIPE_MAINTAINER_pn-lttng-tools = "Richard Purdie <richard.purdie@linuxfoundation.org>" 455RECIPE_MAINTAINER_pn-lttng-tools = "Richard Purdie <richard.purdie@linuxfoundation.org>"
456RECIPE_MAINTAINER_pn-lttng-ust = "Richard Purdie <richard.purdie@linuxfoundation.org>" 456RECIPE_MAINTAINER_pn-lttng-ust = "Richard Purdie <richard.purdie@linuxfoundation.org>"
457RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko <denys@ti.com>" 457RECIPE_MAINTAINER_pn-lz4 = "Denys Dmytriyenko <denys@denix.org>"
458RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko <denys@ti.com>" 458RECIPE_MAINTAINER_pn-lzo = "Denys Dmytriyenko <denys@denix.org>"
459RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko <denys@ti.com>" 459RECIPE_MAINTAINER_pn-lzip = "Denys Dmytriyenko <denys@denix.org>"
460RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko <denys@ti.com>" 460RECIPE_MAINTAINER_pn-lzop = "Denys Dmytriyenko <denys@denix.org>"
461RECIPE_MAINTAINER_pn-m4 = "Robert Yang <liezhi.yang@windriver.com>" 461RECIPE_MAINTAINER_pn-m4 = "Robert Yang <liezhi.yang@windriver.com>"
462RECIPE_MAINTAINER_pn-m4-native = "Robert Yang <liezhi.yang@windriver.com>" 462RECIPE_MAINTAINER_pn-m4-native = "Robert Yang <liezhi.yang@windriver.com>"
463RECIPE_MAINTAINER_pn-make = "Robert Yang <liezhi.yang@windriver.com>" 463RECIPE_MAINTAINER_pn-make = "Robert Yang <liezhi.yang@windriver.com>"
@@ -501,7 +501,7 @@ RECIPE_MAINTAINER_pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>"
501RECIPE_MAINTAINER_pn-mpfr = "Khem Raj <raj.khem@gmail.com>" 501RECIPE_MAINTAINER_pn-mpfr = "Khem Raj <raj.khem@gmail.com>"
502RECIPE_MAINTAINER_pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" 502RECIPE_MAINTAINER_pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>"
503RECIPE_MAINTAINER_pn-msmtp = "Alexander Kanavin <alex.kanavin@gmail.com>" 503RECIPE_MAINTAINER_pn-msmtp = "Alexander Kanavin <alex.kanavin@gmail.com>"
504RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <denys@ti.com>" 504RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <denys@denix.org>"
505RECIPE_MAINTAINER_pn-mtdev = "Anuj Mittal <anuj.mittal@intel.com>" 505RECIPE_MAINTAINER_pn-mtdev = "Anuj Mittal <anuj.mittal@intel.com>"
506RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>" 506RECIPE_MAINTAINER_pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>"
507RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>" 507RECIPE_MAINTAINER_pn-musl = "Khem Raj <raj.khem@gmail.com>"
@@ -545,7 +545,7 @@ RECIPE_MAINTAINER_pn-pango = "Ross Burton <ross.burton@arm.com>"
545RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>" 545RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>"
546RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <hongxu.jia@windriver.com>" 546RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <hongxu.jia@windriver.com>"
547RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.org>" 547RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.org>"
548RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>" 548RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@denix.org>"
549RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>" 549RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>"
550RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>" 550RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>"
551RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@gmail.com>" 551RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@gmail.com>"
@@ -576,6 +576,7 @@ RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravch
576RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" 576RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
577RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" 577RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
578RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" 578RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
579RECIPE_MAINTAINER_pn-python3-dtschema-wrapper = "Bruce Ashfield <bruce.ashfield@gmail.com>"
579RECIPE_MAINTAINER_pn-python3-pycryptodome = "Joshua Watt <JPEWhacker@gmail.com>" 580RECIPE_MAINTAINER_pn-python3-pycryptodome = "Joshua Watt <JPEWhacker@gmail.com>"
580RECIPE_MAINTAINER_pn-python3-pycryptodomex = "Joshua Watt <JPEWhacker@gmail.com>" 581RECIPE_MAINTAINER_pn-python3-pycryptodomex = "Joshua Watt <JPEWhacker@gmail.com>"
581RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" 582RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
@@ -661,9 +662,9 @@ RECIPE_MAINTAINER_pn-systemd-conf = "Chen Qi <Qi.Chen@windriver.com>"
661RECIPE_MAINTAINER_pn-systemd-compat-units = "Chen Qi <Qi.Chen@windriver.com>" 662RECIPE_MAINTAINER_pn-systemd-compat-units = "Chen Qi <Qi.Chen@windriver.com>"
662RECIPE_MAINTAINER_pn-systemd-serialgetty = "Chen Qi <Qi.Chen@windriver.com>" 663RECIPE_MAINTAINER_pn-systemd-serialgetty = "Chen Qi <Qi.Chen@windriver.com>"
663RECIPE_MAINTAINER_pn-systemd-systemctl-native = "Chen Qi <Qi.Chen@windriver.com>" 664RECIPE_MAINTAINER_pn-systemd-systemctl-native = "Chen Qi <Qi.Chen@windriver.com>"
664RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <kamensky@cisco.com>" 665RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <victor.kamensky7@gmail.com>"
665RECIPE_MAINTAINER_pn-systemtap-native = "Victor Kamensky <kamensky@cisco.com>" 666RECIPE_MAINTAINER_pn-systemtap-native = "Victor Kamensky <victor.kamensky7@gmail.com>"
666RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <kamensky@cisco.com>" 667RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <victor.kamensky7@gmail.com>"
667RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <ross.burton@arm.com>" 668RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <ross.burton@arm.com>"
668RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <ross.burton@arm.com>" 669RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <ross.burton@arm.com>"
669RECIPE_MAINTAINER_pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>" 670RECIPE_MAINTAINER_pn-taglib = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -685,7 +686,7 @@ RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <ross.burton@arm.com>"
685RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <ross.burton@arm.com>" 686RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <ross.burton@arm.com>"
686RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <ross.burton@arm.com>" 687RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <ross.burton@arm.com>"
687RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>" 688RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie <richard.purdie@linuxfoundation.org>"
688RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko <denys@ti.com>" 689RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko <denys@denix.org>"
689RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton <ross.burton@arm.com>" 690RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton <ross.burton@arm.com>"
690RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kanavin@gmail.com>" 691RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kanavin@gmail.com>"
691RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kanavin@gmail.com>" 692RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kanavin@gmail.com>"
@@ -706,11 +707,11 @@ RECIPE_MAINTAINER_pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>"
706RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@arm.com>" 707RECIPE_MAINTAINER_pn-waffle = "Ross Burton <ross.burton@arm.com>"
707RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>" 708RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>"
708RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>" 709RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>"
709RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@ti.com>" 710RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@denix.org>"
710RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@ti.com>" 711RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@denix.org>"
711RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>" 712RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>"
712RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>" 713RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@denix.org>"
713RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>" 714RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@denix.org>"
714RECIPE_MAINTAINER_pn-wget = "Yi Zhao <yi.zhao@windriver.com>" 715RECIPE_MAINTAINER_pn-wget = "Yi Zhao <yi.zhao@windriver.com>"
715RECIPE_MAINTAINER_pn-which = "Anuj Mittal <anuj.mittal@intel.com>" 716RECIPE_MAINTAINER_pn-which = "Anuj Mittal <anuj.mittal@intel.com>"
716RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>" 717RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -764,6 +765,6 @@ RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <akuster808@gmail.com>"
764RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <akuster808@gmail.com>" 765RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <akuster808@gmail.com>"
765RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <akuster808@gmail.com>" 766RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <akuster808@gmail.com>"
766RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" 767RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>"
767RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" 768RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@denix.org>"
768RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" 769RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@denix.org>"
769RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" 770RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@denix.org>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index c13ff724b1..3fb7ec2657 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -26,6 +26,7 @@ PTESTS_FAST = "\
26 liberror-perl-ptest \ 26 liberror-perl-ptest \
27 libmodule-build-perl-ptest \ 27 libmodule-build-perl-ptest \
28 libpcre-ptest \ 28 libpcre-ptest \
29 libpng-ptest \
29 libtimedate-perl-ptest \ 30 libtimedate-perl-ptest \
30 libtest-needs-perl-ptest \ 31 libtest-needs-perl-ptest \
31 liburi-perl-ptest \ 32 liburi-perl-ptest \
@@ -60,6 +61,7 @@ PTESTS_FAST = "\
60# bash-ptest \ # Test outcomes are non-deterministic by design 61# bash-ptest \ # Test outcomes are non-deterministic by design
61# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py 62# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
62# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts 63# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts
64# libinput-ptest \ # Tests need an unloaded system to be reliable
63#" 65#"
64 66
65PTESTS_SLOW = "\ 67PTESTS_SLOW = "\
diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc
index 85336014b1..4ac66fd506 100644
--- a/meta/conf/distro/include/yocto-uninative.inc
+++ b/meta/conf/distro/include/yocto-uninative.inc
@@ -6,9 +6,10 @@
6# to the distro running on the build machine. 6# to the distro running on the build machine.
7# 7#
8 8
9UNINATIVE_MAXGLIBCVERSION = "2.32" 9UNINATIVE_MAXGLIBCVERSION = "2.39"
10UNINATIVE_VERSION = "4.4"
10 11
11UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.10/" 12UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/"
12UNINATIVE_CHECKSUM[aarch64] ?= "645e5c50b2b48aabb8b10f783a9f94b4b7c5ddc7cfceb5386d43b86d30253202" 13UNINATIVE_CHECKSUM[aarch64] ?= "b61876130f494f75092f21086b4a64ea5fb064045769bf1d32e9cb6af17ea8ec"
13UNINATIVE_CHECKSUM[i686] ?= "233e09b5ff30e15341232a0c16fa8448ff31dccb8f3f3e2ad3948cdac8c4a598" 14UNINATIVE_CHECKSUM[i686] ?= "9f28627828f0082cc0344eede4d9a861a9a064bfa8f36e072e46212f0fe45fcc"
14UNINATIVE_CHECKSUM[x86_64] ?= "04333677f81990ce2cf55c3bc256cd84a66085d18fc95ccddfab8581e4aec014" 15UNINATIVE_CHECKSUM[x86_64] ?= "d81c54284be2bb886931fc87281d58177a2cd381cf99d1981f8923039a72a302"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 1c432275be..7453655417 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -102,4 +102,4 @@ SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native"
102# We need to keep bitbake tools in PATH 102# We need to keep bitbake tools in PATH
103# Avoid empty path entries 103# Avoid empty path entries
104BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" 104BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}"
105PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' is not '' else ''}${HOSTTOOLS_DIR}" 105PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}"
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 5b309eb385..c78823e847 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -13,24 +13,39 @@
13SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0" 13SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0"
14SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0" 14SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0"
15SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0" 15SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0"
16SPDXLICENSEMAP[AGPL-3.0-only] = "AGPL-3.0"
16 17
17# GPL variations 18# GPL variations
18SPDXLICENSEMAP[GPL-1] = "GPL-1.0" 19SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
19SPDXLICENSEMAP[GPLv1] = "GPL-1.0" 20SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
20SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0" 21SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
22SPDXLICENSEMAP[GPL-1.0-only] = "GPL-1.0"
21SPDXLICENSEMAP[GPL-2] = "GPL-2.0" 23SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
22SPDXLICENSEMAP[GPLv2] = "GPL-2.0" 24SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
25SPDXLICENSEMAP[GPLv2+] = "GPL-2.0+"
23SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0" 26SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
27SPDXLICENSEMAP[GPLv2.0+] = "GPL-2.0+"
28SPDXLICENSEMAP[GPL-2.0-only] = "GPL-2.0"
24SPDXLICENSEMAP[GPL-3] = "GPL-3.0" 29SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
25SPDXLICENSEMAP[GPLv3] = "GPL-3.0" 30SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
31SPDXLICENSEMAP[GPLv3+] = "GPL-3.0+"
26SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0" 32SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
33SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0+"
34SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
27 35
28#LGPL variations 36#LGPL variations
29SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0" 37SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
38SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0+"
30SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0" 39SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
40SPDXLICENSEMAP[LGPLv2.0+] = "LGPL-2.0+"
41SPDXLICENSEMAP[LGPL-2.0-only] = "LGPL-2.0"
31SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1" 42SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
32SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1" 43SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
44SPDXLICENSEMAP[LGPLv2.1+] = "LGPL-2.1+"
45SPDXLICENSEMAP[LGPL-2.1-only] = "LGPL-2.1"
33SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0" 46SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
47SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0+"
48SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
34 49
35#MPL variations 50#MPL variations
36SPDXLICENSEMAP[MPL-1] = "MPL-1.0" 51SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index d231107f8b..e9767c73b6 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,6 +11,8 @@ STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" 11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
12RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" 12RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot"
13 13
14PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
15
14INHERIT += "multilib_global" 16INHERIT += "multilib_global"
15 17
16BBCLASSEXTEND_append = " ${MULTILIBS}" 18BBCLASSEXTEND_append = " ${MULTILIBS}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 22:03:33 +0000