diff options
Diffstat (limited to 'poky/meta/conf/distro/include')
| -rw-r--r-- | poky/meta/conf/distro/include/cve-extra-exclusions.inc | 4 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/maintainers.inc | 3 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/rust_versions.inc | 13 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 15 |
4 files changed, 15 insertions, 20 deletions
diff --git a/poky/meta/conf/distro/include/cve-extra-exclusions.inc b/poky/meta/conf/distro/include/cve-extra-exclusions.inc index cf07acce1..a6f52b5de 100644 --- a/poky/meta/conf/distro/include/cve-extra-exclusions.inc +++ b/poky/meta/conf/distro/include/cve-extra-exclusions.inc @@ -61,10 +61,6 @@ CVE_CHECK_WHITELIST += "CVE-2020-29509 CVE-2020-29511" # There was a proposed patch https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg06098.html # however qemu maintainers are sure the patch is incorrect and should not be applied. -# flex:flex-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-6293 -# Upstream bug, still open: https://github.com/westes/flex/issues/414 -# Causes memory exhaustion so potential DoS but no buffer overflow, low priority - # wget https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 # https://mail.gnu.org/archive/html/bug-wget/2021-02/msg00002.html # No response upstream as of 2021/5/12 diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 0e8185f4e..8592de5a6 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/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>" diff --git a/poky/meta/conf/distro/include/rust_versions.inc b/poky/meta/conf/distro/include/rust_versions.inc deleted file mode 100644 index a11ba22a8..000000000 --- a/poky/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/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index 47f23f5c3..27e60b60a 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -21,12 +21,13 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.37%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.34" -LINUXLIBCVERSION ?= "5.13%" +LINUXLIBCVERSION ?= "5.14%" QEMUVERSION ?= "6.0%" 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.54.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}" + |