aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-08-02 17:10:51 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-11-20 00:33:16 +0000
commitbad73bf315325c3428e331984f9d17bb8b2873b3 (patch)
treef1af509d2d534d7232ab63304faf52e549fbaeca /meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
parent5f1d801530f9b3d7f99826b4cc8cc23df77d1e42 (diff)
Convert to new override syntax
This is effectively a manual cherry-pick and squash of commits: dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f 917a82316bf53ead29d6345a39189d9e4efeef25 20e81c0a9d36660de671dd5ac2e006e31c0e621b 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: I91c1640c6335d7748a2531d2fe8bf86d2d2aee32 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26876 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-kernel/linux/linux-agl-config.inc')
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl-config.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
index 4003dd970..a5e9c375a 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc
@@ -22,14 +22,14 @@
# perspective) AGL additions.
#
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
# NOTE: AGL_KERNEL_SRC is explicitly intended as an intermediate variable
# that can be used as a last resort to completely disable all AGL
# additions, modifying or appending it is not recommended.
AGL_KERNEL_SRC ?= "${@' '.join(['file://' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}"
-SRC_URI_append = " ${AGL_KERNEL_SRC}"
+SRC_URI:append = " ${AGL_KERNEL_SRC}"
# For meta-ti and meta-qcom
KERNEL_CONFIG_FRAGMENTS ?= "${@' '.join(['${WORKDIR}/' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}"
@@ -54,29 +54,29 @@ AGL_KCONFIG_FRAGMENTS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '
#
# Enable required features for the agl-netboot feature
-AGL_KCONFIG_FRAGMENTS_append_netboot = " \
+AGL_KCONFIG_FRAGMENTS:append:netboot = " \
nbd.cfg \
ramdisk.cfg \
"
# Add hda audio and required virtio device support for qemu
-AGL_KCONFIG_FRAGMENTS_append_qemuall = " \
+AGL_KCONFIG_FRAGMENTS:append:qemuall = " \
sound-hda.cfg \
qemu-virtio.cfg \
qemu-drm.cfg \
"
# Configuration for using the ARM virt machine (and not versatilepb)
-AGL_KCONFIG_FRAGMENTS_append_qemuarm = " qemuarm.cfg"
+AGL_KCONFIG_FRAGMENTS:append:qemuarm = " qemuarm.cfg"
# Additional drivers for virtual machines
# OVERRIDES save us some c'n'p below ...
-OVERRIDES_prepend_qemux86 = "virtualmachine:"
-OVERRIDES_prepend_qemux86-64 = "virtualmachine:"
-AGL_KCONFIG_FRAGMENTS_append_virtualmachine = " vbox-vmware-sata.cfg"
+OVERRIDES:prepend:qemux86 = "virtualmachine:"
+OVERRIDES:prepend:qemux86-64 = "virtualmachine:"
+AGL_KCONFIG_FRAGMENTS:append_virtualmachine = " vbox-vmware-sata.cfg"
# Extra configuration for using qemux86-64 image on physical hardware
-AGL_KCONFIG_FRAGMENTS_append_qemux86-64 = " \
+AGL_KCONFIG_FRAGMENTS:append:qemux86-64 = " \
x86-extra-graphic-devices.cfg \
x86-net-devices.cfg \
x86-security-tpm.cfg \