diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:57:33 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:57:33 -0400 |
| commit | 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 (patch) | |
| tree | cf70d6c9e3832d8734de4f66f2d0fe52b104c9fd /templates | |
| parent | ab5f7f52dbdbea04d1f79310cbf08922a5371345 (diff) | |
Convert to new override syntax
This is mostly the result of running a slightly customized version
of the convert-overrides.py script from poky with additional
overrides added. A few minor fixups were done by hand afterwards
during a review of the changes.
The intent of these changes is to minimize the effort to keep the
"next" branch that builds against poky master up to date and tested
in preparation for the switch to the next Yocto LTS release in
early 2022.
Bug-AGL: SPEC-4052
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I0bbae97331abee1367b368ce54ab39e3162a12ec
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/feature/agl-jailhouse/50_local.conf.inc | 22 | ||||
| -rw-r--r-- | templates/feature/agl-lxc/50_local.conf.inc | 2 | ||||
| -rw-r--r-- | templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc index 620c0a5f..4b5e42f4 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 -serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait" +QB_OPT_APPEND:append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex -serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait" QB_MEM = "-m 2048" # 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 -serial telnet:localhost:5432,server,nowait -vga virtio" @@ -33,10 +33,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jailhouse-custom" # prevent most external kernel module from being built MOST_DRIVERS = "" -LTTNGUST_forcevariable := "" -LTTNGTOOLS_forcevariable := "" -LTTNGMODULES_forcevariable := "" +LTTNGUST:forcevariable := "" +LTTNGTOOLS:forcevariable := "" +LTTNGMODULES:forcevariable := "" # Disable perf build -PERF_forcevariable := "" +PERF:forcevariable := "" diff --git a/templates/feature/agl-lxc/50_local.conf.inc b/templates/feature/agl-lxc/50_local.conf.inc index 3c652b41..5c5fc4ac 100644 --- a/templates/feature/agl-lxc/50_local.conf.inc +++ b/templates/feature/agl-lxc/50_local.conf.inc @@ -5,4 +5,4 @@ BBMULTICONFIG = "agl-container-guest" # in case of linux container is not necessary to the 'virtualization'. # This should be revisited when upgrading past dunfell, as less of # the extra configuration may be enabled in the future. -INHERIT_remove = "sanity-meta-virt" +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 |