diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:57:33 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-11-17 14:19:36 -0500 |
| commit | a8dbd14daaac8b5c52326262dbc43975836cc0df (patch) | |
| tree | e52e3eaaa084ddf2d3fb44158cd0f2d5c9140178 /meta-agl-jailhouse/dynamic-layers | |
| parent | f9dcc4101b86d14f583319786286a72b63cbbc98 (diff) | |
Convert to new override syntax
This is effectively a manual cherry-pick of commit:
37d3b1b316470fdcfebc59d5522bfbfefc025ff6
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: Ic649d942ac043edc52976a3d4190590bb1c125e7
Diffstat (limited to 'meta-agl-jailhouse/dynamic-layers')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index 687980cf..ce7b0227 100644 --- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -1,5 +1,5 @@ -do_deploy_append_raspberrypi4() { +do_deploy:append:raspberrypi4() { # if ARMSTUB is set, it should be set in config.txt by earlier recipes, so replace it if [ -n "${ARMSTUB}" ]; then sed -i 's/^armstub=.*/armstub=bl31.bin/' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 158eb6e8..e84d2409 100644 --- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -6,7 +6,7 @@ TFA_PLATFORM = "rpi4" # partition that is generated from the files in DEPLOYDIR do_install[noexec] = "1" -FILES_${PN} = "" +FILES:${PN} = "" do_deploy() { if ${@"true" if d.getVar('TFA_DEBUG') == '1' else "false"}; then diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend index 1d8ea6b7..b1f29275 100644 --- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend +++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend @@ -1,2 +1,2 @@ -DEPENDS_append_raspberrypi4 = " trusted-firmware-a" +DEPENDS:append:raspberrypi4 = " trusted-firmware-a" diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend index 1456fdc8..ba3505fe 100644 --- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend +++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-dt-dtoverlays-Add-jailhouse-memory-DT-overlay.patch" |