diff options
Diffstat (limited to 'poky/meta/conf')
-rw-r--r-- | poky/meta/conf/bitbake.conf | 1 | ||||
-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 | ||||
-rw-r--r-- | poky/meta/conf/licenses.conf | 30 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemu.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/x86/x86-base.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarmv5.conf | 5 |
12 files changed, 42 insertions, 39 deletions
diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 2140d498f7..e25d632dc1 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -811,6 +811,7 @@ 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" diff --git a/poky/meta/conf/distro/include/cve-extra-exclusions.inc b/poky/meta/conf/distro/include/cve-extra-exclusions.inc index cf07acce1d..a6f52b5de7 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 0e8185f4e3..8592de5a66 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 a11ba22a8f..0000000000 --- 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 47f23f5c39..27e60b60aa 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}" + diff --git a/poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf index e2bd58f84a..991fb6cc23 100644 --- a/poky/meta/conf/licenses.conf +++ b/poky/meta/conf/licenses.conf @@ -19,6 +19,9 @@ SPDXLICENSEMAP[AGPLv3.0+] = "AGPL-3.0-or-later" SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only" SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later" +# BSD variations +SPDXLICENSEMAP[BSD-0-Clause] = "0BSD" + # GPL variations SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only" SPDXLICENSEMAP[GPL-1+] = "GPL-1.0-or-later" @@ -45,7 +48,7 @@ SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0-or-later" SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only" SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later" -#LGPL variations +# LGPL variations SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only" SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0-or-later" SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only" @@ -63,49 +66,52 @@ SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0-or-later" SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later" -#MPL variations +# MPL variations SPDXLICENSEMAP[MPL-1] = "MPL-1.0" SPDXLICENSEMAP[MPLv1] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" -#MIT variations +# MIT variations SPDXLICENSEMAP[MIT-X] = "MIT" SPDXLICENSEMAP[MIT-style] = "MIT" -#Openssl variations +# Openssl variations SPDXLICENSEMAP[openssl] = "OpenSSL" -#PSF variations +# PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" -#Python variations +# Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" -#Apache variations +# Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" -#Artistic variations +# Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" -#Academic variations +# Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" -#CDDL variations +# CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" -#Other variations +# Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" SPDXLICENSEMAP[FreeType] = "FTL" +SPDXLICENSEMAP[Nauman] = "Naumen" +SPDXLICENSEMAP[tcl] = "TCL" +SPDXLICENSEMAP[vim] = "Vim" -#Silicon Graphics variations +# Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" # Additional license directories. Add your custom licenses directories this path. diff --git a/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc index 101d5331bc..6fd12fb842 100644 --- a/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc +++ b/poky/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/poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc index c7136da711..642c322abc 100644 --- a/poky/meta/conf/machine/include/qemu.inc +++ b/poky/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/poky/meta/conf/machine/include/x86/x86-base.inc b/poky/meta/conf/machine/include/x86/x86-base.inc index 958b3490e8..44e4b4ec46 100644 --- a/poky/meta/conf/machine/include/x86/x86-base.inc +++ b/poky/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/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 93d855b6e1..d71a793edf 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -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/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index ea7fae2722..3b08dedddc 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -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/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index 6c99a52965..3c2c4997b9 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/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" |