From a8dbd14daaac8b5c52326262dbc43975836cc0df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:57:33 -0400 Subject: Convert to new override syntax This is effectively a manual cherry-pick of commit: 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 from the master branch with additional review and fixups. The intent of these changes is to minimize the effort to backport fixes from the master branch, which has been updated in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4144 Signed-off-by: Scott Murray Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7 --- templates/feature/agl-jailhouse/50_local.conf.inc | 14 +++++++------- templates/feature/agl-lxc/50_local.conf.inc | 4 ++-- .../feature/agl-voiceagent-alexa/50_bblayers.conf.inc | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'templates/feature') diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc index 081c53fb..0acefaa3 100644 --- a/templates/feature/agl-jailhouse/50_local.conf.inc +++ b/templates/feature/agl-jailhouse/50_local.conf.inc @@ -1,20 +1,20 @@ #### JAILHOUSE -IMAGE_INSTALL_append = " jailhouse jailhouse-demos" +IMAGE_INSTALL:append = " jailhouse jailhouse-demos" PREFERRED_VERSION_linux-raspberrypi = "5.4%" -RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo" +RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/jailhouse-memory.dtbo" #Qemu Boot Config # qemu flags for jailhouse -QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex" +QB_OPT_APPEND:append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex" QB_MEM = "-m 1G" # use override with higher priority than x86-64 -QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4" -QB_CPU_qemux86-64 = "-enable-kvm" -QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor" +QB_MACHINE:qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4" +QB_CPU:qemux86-64 = "-enable-kvm" +QB_CPU_KVM:qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor" -QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M$0x22000000" +QB_KERNEL_CMDLINE_APPEND:append = " intel_iommu=off memmap=82M$0x22000000" QB_KERNEL_ROOT = "/dev/vda" QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait" diff --git a/templates/feature/agl-lxc/50_local.conf.inc b/templates/feature/agl-lxc/50_local.conf.inc index 6f337415..964376de 100644 --- a/templates/feature/agl-lxc/50_local.conf.inc +++ b/templates/feature/agl-lxc/50_local.conf.inc @@ -3,5 +3,5 @@ BBMULTICONFIG = "agl-container-guest" # Disable the meta-virtualization configuration support enabled by # agl-virt. This should be revisited when upgrading past dunfell, # as less of the extra configuration may be enabled in the future. -DISTRO_FEATURES_remove = "virtualization" -INHERIT_remove = "sanity-meta-virt" +DISTRO_FEATURES:remove = "virtualization" +INHERIT:remove = "sanity-meta-virt" diff --git a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc index ab41cdbd..088268ab 100644 --- a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc +++ b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc @@ -12,4 +12,4 @@ BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/system-au # For now, tweak the layer's compatibility to allow using with zeus, # since we know it works without major issues. -LAYERSERIES_COMPAT_aac_append = " dunfell" \ No newline at end of file +LAYERSERIES_COMPAT_aac:append = " dunfell" \ No newline at end of file -- cgit 1.2.3-korg