diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:58:45 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-11-17 14:20:22 -0500 |
| commit | 12ad591d3038db609db5290d8bbe809a34c743de (patch) | |
| tree | dbbcc9a44134a012f531d48132c8803c3940bfa2 /conf/include | |
| parent | 88c424f8b8c78dfc5520ea9be1866027df4735b8 (diff) | |
Convert to new override syntaxlamprey_12.1.2lamprey_12.1.1lamprey_12.1.0lamprey/12.1.2lamprey/12.1.1lamprey/12.1.012.1.212.1.112.1.0
This is effectively a manual cherry-pick and squash of commits:
4249268041b879b3d2bae338d5de88f4f2d54b26
07f4ab8c2833ae5377b97cc9e3820bed67e539d0
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 <scott.murray@konsulko.com>
Change-Id: I3b47f1b7d62038b314a17763d24a64f6d4e15e72
Diffstat (limited to 'conf/include')
| -rw-r--r-- | conf/include/agl-demo-preload.inc | 4 | ||||
| -rw-r--r-- | conf/include/agl-demo.inc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc index 484bc0578..a41168951 100644 --- a/conf/include/agl-demo-preload.inc +++ b/conf/include/agl-demo-preload.inc @@ -1,8 +1,8 @@ -AGL_FEATURES_append = " agl-demo-preload" +AGL_FEATURES:append = " agl-demo-preload" # Use demo device mapping for low-can that enables sllin0 PREFERRED_RPROVIDER_virtual/low-can-dev-mapping = "dev-mapping-demo" # Extend agl-voiceagent-alexa image feature to preload voiceagent # configuration package. -FEATURE_PACKAGES_agl-voiceagent-alexa_append = " virtual/alexa-voiceagent-config" +FEATURE_PACKAGES_agl-voiceagent-alexa:append = " virtual/alexa-voiceagent-config" diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc index 17be8e90b..99085c183 100644 --- a/conf/include/agl-demo.inc +++ b/conf/include/agl-demo.inc @@ -1,23 +1,23 @@ IMAGE_FEATURES =+ "debug-tweaks" -DISTRO_FEATURES_append = " automount " +DISTRO_FEATURES:append = " automount " # convenience -IMAGE_INSTALL_append = " screen mc " +IMAGE_INSTALL:append = " screen mc " # Include all kernel modules here for ease-of-use during development. # Note that this is conditional on virtual/kernel not being linux-dummy # in order to allow building the demo images as containers. # Comment this out to switch to selecting the kernel modules # individually. -IMAGE_INSTALL_append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}" +IMAGE_INSTALL:append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}" # Extend agl-voiceagent-alexa image feature with local alexa-viewer # package. -FEATURE_PACKAGES_agl-voiceagent-alexa_append = " alexa-viewer" +FEATURE_PACKAGES_agl-voiceagent-alexa:append = " alexa-viewer" # enable the layer -AGL_FEATURES_append = " agldemo" +AGL_FEATURES:append = " agldemo" # Set preferred provider for low-can device mapping configuration PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'dev-mapping-ci', 'dev-mapping', d)}" @@ -27,4 +27,4 @@ PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config" FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services" # install virtualbox drivers for vmdk -IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}" +IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}" |