diff options
| author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
| commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
| tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /poky/meta/conf/machine/include | |
| parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
| parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
| download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz | |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'poky/meta/conf/machine/include')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 101d5331b..6fd12fb84 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 c7136da71..642c322ab 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 958b3490e..44e4b4ec4 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 |