From dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 2 Aug 2021 17:10:51 -0400 Subject: 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 Change-Id: Ia3bf63b7cb1aa1d95ada373d1a3ab56def0a125d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26564 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 --- .../recipes-kernel/linux/kernel-devsrc_agl.inc | 2 +- meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc | 6 +++--- meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc | 4 ++-- .../recipes-kernel/linux/linux-agl-config.inc | 18 +++++++++--------- meta-agl-core/recipes-kernel/linux/linux-agl.inc | 2 +- meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'meta-agl-core/recipes-kernel') diff --git a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc index 52fe69d24..39289fef7 100644 --- a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc +++ b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc @@ -1,5 +1,5 @@ # fix for kernel using hardcoded awk while our filesystem only provides gawk -do_install_append() { +do_install:append() { # enforce all scripts to use /usr/bin/awk . This fixes the rpm dependency failure on install of kernel-devsrc cd ${D} || true ( for i in `grep -srI "\!/bin/awk" | cut -d":" -f1 ` ; do sed -i -e "s#\!/bin/awk#\!/usr/bin/env awk#g" $i ; done ) || true diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc index 6d5c67021..8476f343b 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.14:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.14:" #------------------------------------------------------------------------- # smack patches for kernels keys -SRC_URI_append_with-lsm-smack = "\ +SRC_URI:append:with-lsm-smack = "\ file://Smack-Privilege-check-on-key-operations.patch \ file://Smack-Handle-CGROUP2-in-the-same-way-that-CGROUP.patch \ " -SRC_URI_append = "\ +SRC_URI:append = "\ file://net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch \ file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \ " diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc index da4e0c067..1ea476426 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.19:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.19:" -SRC_URI_append = "\ +SRC_URI:append = "\ file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \ " 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 \ diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-agl.inc index 547c23987..c318716fe 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl.inc @@ -15,7 +15,7 @@ def find_cfgs(d): return sources_list -do_configure_append () { +do_configure:append () { if [ -n "${AGL_KCONFIG_FRAGMENTS}" ]; then [ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config merge_config.sh -m .config ${@" ".join(find_cfgs(d))} diff --git a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc index dd4e8e87c..8628731cb 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc @@ -4,9 +4,9 @@ include linux-agl-config.inc # For qemuarm, build a generic v7 kernel instead of the arm926j one that # upstream qemuarm defaults to. -KBUILD_DEFCONFIG_qemuarm = "multi_v7_defconfig" +KBUILD_DEFCONFIG:qemuarm = "multi_v7_defconfig" # Use alldefconfig for the qemu targets, but let other kernel-yocto # based BSPs use their own defaults (note that linux-renesas and # linux-raspberrypi also default to alldefconfig). -KCONFIG_MODE_qemuall = "--alldefconfig" +KCONFIG_MODE:qemuall = "--alldefconfig" -- cgit 1.2.3-korg