summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-08-20 13:58:45 -0400
committerScott Murray <scott.murray@konsulko.com>2021-08-20 15:51:10 -0400
commit4249268041b879b3d2bae338d5de88f4f2d54b26 (patch)
tree757fd0c2daef3e0ccea1a12c27f900defaea2827 /conf
parente89376af34201168a3e8d3fe72258b587edb7d71 (diff)
Convert to new override syntax
This is the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. 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: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac
Diffstat (limited to 'conf')
-rw-r--r--conf/include/agl-demo-preload.inc4
-rw-r--r--conf/include/agl-demo.inc12
2 files changed, 8 insertions, 8 deletions
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc
index 484bc057..a4116895 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 17be8e90..99085c18 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)}"