From bad73bf315325c3428e331984f9d17bb8b2873b3 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 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 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 --- .../recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- .../arm-trusted-firmware/arm-trusted-firmware_git.bbappend | 4 ++-- .../recipes-bsp/bootfiles/renesas-ota-bootfiles.bb | 4 ++-- .../meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb | 4 ++-- .../meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend | 4 ++-- .../meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb | 4 ++-- .../recipes-bsp/optee/optee-user-app-template_git.bb | 4 ++-- .../recipes-bsp/u-boot/u-boot_2020.01.bbappend | 4 ++-- .../recipes-graphics/gles-module/gles-user-module.bbappend | 4 ++-- .../recipes-graphics/wayland/wayland-wsegl.bbappend | 2 +- .../recipes-graphics/wayland/weston-ini-conf.bbappend | 12 ++++++------ .../kernel-module-gles/kernel-module-gles.bbappend | 2 +- .../kernel-module-mmngr/kernel-module-mmngr.bbappend | 2 +- .../kernel-module-mmngr/kernel-module-mmngrbuf.bbappend | 2 +- .../kernel-module-vspmif/kernel-module-vspmif.bbappend | 2 +- .../recipes-kernel/linux/linux-renesas_%.bbappend | 9 +++++---- .../packagegroup-agl-graphical-multimedia.bbappend | 2 +- 17 files changed, 34 insertions(+), 33 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend index 44c2a2b99..86ab018da 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend index cdfb3cbe0..4ba36ca2c 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-Boot-Normal-World-in-EL2.patch \ " diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb index 4007e7f96..e8235b9bd 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)" S = "${WORKDIR}" -SRC_URI_append_sota = "file://uEnv-ota-m3ulcb.txt \ +SRC_URI:append:sota = "file://uEnv-ota-m3ulcb.txt \ file://uEnv-ota-h3ulcb.txt \ file://uEnv-ota-h3-salvator-xs \ file://uEnv-ota-m3-salvator-xs" @@ -16,7 +16,7 @@ do_deploy() { install -d ${DEPLOYDIR}/${PN} } -do_deploy_append_sota() { +do_deploy:append:sota() { install -m 0755 ${WORKDIR}/uEnv-ota-${BOARD_NAME}.txt ${DEPLOYDIR}/${PN}/uEnv.txt } diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb index 9c26de666..9d06df251 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb @@ -26,7 +26,7 @@ CFLAGS += "-Wno-extra -Wno-error=format" TARGET_CFLAGS += "-Wno-extra -Wno-error=format" TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" @@ -58,4 +58,4 @@ do_install () { cp ${S}/hello_world/ta/include/* ${D}${includedir} } -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" +FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend index 77eeab9f3..52a68e174 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend @@ -3,5 +3,5 @@ do_install() { cp -r ${S}/out/arm-plat-${PLATFORM}/export-ta_arm64 ${D}/usr/share/optee } -FILES_${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a" -FILES_${PN}-dev += "${datadir}/optee/export-ta_arm64" +FILES:${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a" +FILES:${PN}-dev += "${datadir}/optee/export-ta_arm64" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb index fdbd268a3..2feda0eab 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb @@ -34,7 +34,7 @@ CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" TARGET_CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" S = "${WORKDIR}/git" EXTRA_OEMAKE = "-e MAKEFLAGS=" @@ -52,4 +52,4 @@ do_install () { install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ } -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" +FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb index 4c244a985..1577f8f56 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb @@ -24,7 +24,7 @@ CFLAGS += "-Wno-extra -Wno-error=format" TARGET_CFLAGS += "-Wno-extra -Wno-error=format" TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" @@ -54,4 +54,4 @@ do_install () { install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz } -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" +FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend index b8b5cbea5..ec75d0585 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " file://remove-redundant-yyloc-global.patch " +SRC_URI:append = " file://remove-redundant-yyloc-global.patch " diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend index ab59db6f0..7beb4c25c 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend @@ -1,8 +1,8 @@ require checksum_control.inc -RDEPENDS_${PN}_append = " wayland-wsegl" +RDEPENDS:${PN}:append = " wayland-wsegl" -do_install_append(){ +do_install:append(){ sed -i 's/MODE="0660", OWNER/MODE="0660", SECLABEL{smack}="*", OWNER/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules sed -i 's/GROUP="video"/GROUP="display"/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules } diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend index a08dbbce4..9a0eb73a3 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/wayland-wsegl.bbappend @@ -1 +1 @@ -DEPENDS_append = " wayland-protocols" +DEPENDS:append = " wayland-protocols" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend index 2fd50c3d9..4a76dda04 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,15 +1,15 @@ -FILESEXTRAPATHS_prepend_rcar-gen3 := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rcar-gen3 := "${THISDIR}/${PN}:" -SRC_URI_append_rcar-gen3 = " \ +SRC_URI:append:rcar-gen3 = " \ file://kingfisher_output.cfg \ file://ebisu_output.cfg \ file://salvator-x_output.cfg \ " -WESTON_FRAGMENTS_append_ulcb = " kingfisher_output" -WESTON_FRAGMENTS_append_ebisu = " ebisu_output" -WESTON_FRAGMENTS_append_salvator-x = " salvator-x_output" +WESTON_FRAGMENTS:append:ulcb = " kingfisher_output" +WESTON_FRAGMENTS:append:ebisu = " ebisu_output" +WESTON_FRAGMENTS:append:salvator-x = " salvator-x_output" -do_configure_append_rcar-gen3() { +do_configure:append:rcar-gen3() { echo repaint-window=34 >> ${WORKDIR}/core.cfg } diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend index e6beb5ef1..b8882ae49 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend @@ -1,6 +1,6 @@ require checksum_control.inc -module_do_compile_prepend() { +module_do_compile:prepend() { cd ${S}/build/linux/config/compilers cp aarch64-linux-gnu.mk ${TARGET_SYS}.mk } diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend index 5262a9c5d..98b8e92c3 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend @@ -1,2 +1,2 @@ -KERNEL_MODULE_AUTOLOAD_append = " mmngr" +KERNEL_MODULE_AUTOLOAD:append = " mmngr" KERNEL_MODULE_PACKAGE_SUFFIX = "" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend index 6b935b09e..fbff56fff 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend @@ -1,2 +1,2 @@ -KERNEL_MODULE_AUTOLOAD_append = " mmngrbuf" +KERNEL_MODULE_AUTOLOAD:append = " mmngrbuf" KERNEL_MODULE_PACKAGE_SUFFIX = "" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend index 379797248..5efe01045 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend @@ -1,2 +1,2 @@ -KERNEL_MODULE_AUTOLOAD_append = " vspm_if" +KERNEL_MODULE_AUTOLOAD:append = " vspm_if" KERNEL_MODULE_PACKAGE_SUFFIX = "" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend index 72fb53eee..eccac305a 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" require recipes-kernel/linux/linux-yocto-agl.inc # Add ADSP patch to enable and add sound hardware abstraction -SRC_URI_append = " \ +SRC_URI:append = " \ file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \ " @@ -13,9 +13,10 @@ AGL_KCONFIG_FRAGMENTS += "namespace_fix.cfg" AGL_KCONFIG_FRAGMENTS += " \ ${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \ " -SRC_URI_append_m3ulcb = " \ + +SRC_URI:append:m3ulcb = " \ ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a77960-ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \ " -KERNEL_DEVICETREE_append_m3ulcb = " \ +KERNEL_DEVICETREE:append:m3ulcb = " \ ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a77960-ulcb-xen.dtb','',d)} \ " diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend index 28160530b..53eb1c540 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append_rcar-gen3 = "\ +RDEPENDS:${PN}:append:rcar-gen3 = "\ ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-kernel-modules','',d)} \ ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-multimedia-libs','',d)} \ ${@bb.utils.contains('MACHINE_FEATURES','multimedia','packagegroup-gstreamer1.0-plugins','',d)} \ -- cgit 1.2.3-korg