Convert to new override syntax 65/26565/1
authorScott Murray <scott.murray@konsulko.com>
Fri, 20 Aug 2021 17:57:33 +0000 (13:57 -0400)
committerScott Murray <scott.murray@konsulko.com>
Fri, 20 Aug 2021 17:57:33 +0000 (13:57 -0400)
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 <scott.murray@konsulko.com>
Change-Id: I0bbae97331abee1367b368ce54ab39e3162a12ec

78 files changed:
meta-agl-drm-lease/README.md
meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend
meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend
meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/kernel-devsrc.bb
meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-5.14.inc
meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-custom_git.bb
meta-agl-lxc/classes/lxc-config.bbclass
meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend
meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
meta-agl-lxc/recipes-container/lxc/lxc_4.%.bbappend
meta-agl-lxc/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf.bbappend
meta-agl-lxc/recipes-graphics/wayland/weston-init.bbappend
meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
meta-agl-lxc/recipes-multimedia/pipewire-ic-ipc/pipewire-ic-ipc_git.bb
meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
meta-speech-framework/meta-aac-amazonlite/recipes-wakeword/pryon-lite/pryon-lite.bbappend
meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb
meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb
meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend
meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
templates/feature/agl-jailhouse/50_local.conf.inc
templates/feature/agl-lxc/50_local.conf.inc
templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc

index 2c5ba05..b572fbc 100644 (file)
@@ -22,7 +22,7 @@ lease support to the following packages:
 image, add the following to your local.conf
 
 ```
-IMAGE_INSTALL_append = " kmscube"
+IMAGE_INSTALL:append = " kmscube"
 ```
 
 ## Starting the DRM lease manager
index e0a434c..4e48edf 100644 (file)
@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "rcar-gen3"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch \
     file://0002-drm-rcar-du-support-render-node.patch \
 "
index 4fcb785..6a79ec2 100644 (file)
@@ -17,16 +17,16 @@ inherit ptest
 
 DEPENDS = "libdrm libcheck fff"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/drm-lease-manager.service ${D}/${systemd_unitdir}/system
     rm -rf ${D}/${localstatedir}
 }
 
-SYSTEMD_SERVICE_${PN} = "drm-lease-manager.service"
+SYSTEMD_SERVICE:${PN} = "drm-lease-manager.service"
 
 EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Denable-tests=true', '', d)}"
-RDEPENDS_${PN}-ptest = "libcheck"
+RDEPENDS:${PN}-ptest = "libcheck"
 
 do_install_ptest() {
     install ${B}/libdlmclient/test/libdlmclient-test ${D}${PTEST_PATH}
@@ -35,4 +35,4 @@ do_install_ptest() {
 }
 
 PACKAGES =+ "libdlmclient"
-FILES_libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
+FILES:libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
index fb4f997..bc9e8b3 100644 (file)
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 
 SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch \
index b3d63db..9e4630d 100644 (file)
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
             file://0001-backend-drm-Add-method-to-import-DRM-fd.patch \
             file://0002-Add-DRM-lease-support.patch \
             file://0003-launcher-do-not-touch-VT-tty-while-using-non-default.patch \
@@ -9,4 +9,4 @@ SRC_URI_append = " \
             "
 
 PACKAGECONFIG[drm-lease] = "-Ddrm-lease=true,-Ddrm-lease=false,drm-lease-manager"
-PACKAGECONFIG_append = " drm-lease"
+PACKAGECONFIG:append = " drm-lease"
index 687980c..ce7b022 100644 (file)
@@ -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
index 158eb6e..e84d240 100644 (file)
@@ -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
index cc75d68..87519e1 100644 (file)
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
 SRCREV = "630001202caec85370fb4f956e581f51109e490c"
 PV = "0.12+git${SRCPV}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI = "git://github.com/siemens/jailhouse \
            file://qemu-agl.c \
@@ -81,18 +81,18 @@ do_install() {
 }
 
 PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools ${PN}-demos"
-FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
-FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
-FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-* ${JH_DATADIR}/*.tmpl"
-FILES_${PN}-demos = "${JH_DATADIR}/ ${sbindir}/ivshmem-demo"
+FILES:${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
+FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN}-tools = "${libexecdir}/${BPN}/${BPN}-* ${JH_DATADIR}/*.tmpl"
+FILES:${PN}-demos = "${JH_DATADIR}/ ${sbindir}/ivshmem-demo"
 
 # Default Linker Hash Style Changed to "sysv"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-RDEPENDS_${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression python3-mako"
-RDEPENDS_pyjailhouse = "python3-core python3-ctypes python3-fcntl"
-RDEPENDS_${PN}-demos = "jailhouse"
+RDEPENDS:${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression python3-mako"
+RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl"
+RDEPENDS:${PN}-demos = "jailhouse"
 
-RRECOMMENDS_${PN} = "${PN}-tools"
+RRECOMMENDS:${PN} = "${PN}-tools"
 
 KERNEL_MODULE_AUTOLOAD += "jailhouse"
index f207a43..8a6e490 100644 (file)
@@ -270,11 +270,11 @@ do_install() {
 # Ensure we don't race against "make scripts" during cpio
 do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
 
-FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}"
-FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*"
+FILES:${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}"
+FILES:${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*"
 
-RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils"
+RDEPENDS:${PN} = "bc python3 flex bison ${TCLIBC}-utils"
 # 4.15+ needs these next two RDEPENDS
-RDEPENDS_${PN} += "openssl-dev util-linux"
+RDEPENDS:${PN} += "openssl-dev util-linux"
 # and x86 needs a bit more for 4.15+
-RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
index 2807563..7cc70c0 100644 (file)
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
-SRC_URI_append = " file://jailhouse.cfg"
+SRC_URI:append = " file://jailhouse.cfg"
 
index 6eb55e4..0e5818a 100644 (file)
@@ -20,4 +20,4 @@ PV = "5.14-rc2+git${SRCPV}"
 KVER = "5.14"
 
 DEPENDS += "ncurses-native bc-native pkgconfig-native"
-DEPENDS_append_x86-64 = " elfutils-native"
+DEPENDS:append:x86-64 = " elfutils-native"
index 1aefccd..a3bdf80 100644 (file)
@@ -29,7 +29,7 @@ inherit allarch
 
 DRM_LEASE_DEVICE ??= "card0-HDMI-A-1"
 
-DRM_LEASE_DEVICE_qemuall ?= "card0-Virtual-1"
+DRM_LEASE_DEVICE:qemuall ?= "card0-Virtual-1"
 
 LXC_AUTO_START ??= "0"
 
@@ -45,4 +45,4 @@ do_install () {
     done
 }
 
-FILES_${PN} = "${localstatedir}/lib/lxc/"
+FILES:${PN} = "${localstatedir}/lib/lxc/"
index 1e2e932..cf5320e 100644 (file)
@@ -1,23 +1,23 @@
-OVERRIDES_append = ":aglcontainerguest"
+OVERRIDES:append = ":aglcontainerguest"
 
 TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
 
 # Can be blank as container image type results in a .tar.bz2
-AGL_DEFAULT_IMAGE_FSTYPES_aglcontainerguest = ""
-AGL_EXTRA_IMAGE_FSTYPES_aglcontainerguest = ""
+AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerguest = ""
+AGL_EXTRA_IMAGE_FSTYPES:aglcontainerguest = ""
 
-IMAGE_FSTYPES_aglcontainerguest = "container"
+IMAGE_FSTYPES:aglcontainerguest = "container"
 
-IMAGE_LINGUAS_append_aglcontainerguest = " en-us"
+IMAGE_LINGUAS:append:aglcontainerguest = " en-us"
 
 PREFERRED_PROVIDER_virtual/kernel_aglcontainerguest = "linux-dummy"
-KERNEL_DEVICETREE_aglcontainerguest = ""
+KERNEL_DEVICETREE:aglcontainerguest = ""
 
 # Disable serial consoles
-SERIAL_CONSOLES_aglcontainerguest = ""
+SERIAL_CONSOLES:aglcontainerguest = ""
 
 # Remove unneeded firmware packages
-EXTRA_IMAGEDEPENDS_remove_aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
+EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
 
 # We assume rngd is running on the host, so unnecessary in container
 VIRTUAL-RUNTIME_rngd = ""
index e30136f..6060e6b 100644 (file)
@@ -1,4 +1,4 @@
 # Add a hook to disable depending on cryptodev-module for containers
 CRYPTODEV_RDEPENDS = "cryptodev-module"
-CRYPTODEV_RDEPENDS_aglcontainerguest = ""
+CRYPTODEV_RDEPENDS:aglcontainerguest = ""
 PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}"
index 61dfa66..7207849 100644 (file)
@@ -1,11 +1,11 @@
-PACKAGECONFIG_remove = "templates"
+PACKAGECONFIG:remove = "templates"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 # NOTE:
 # This needs to be replaced with a rework of the upstream packaging
 # to do a proper split of core from the template support.
-RDEPENDS_${PN} = ""
+RDEPENDS:${PN} = ""
 
 
 
index 892ac7b..13f85b5 100644 (file)
@@ -1,8 +1,8 @@
 # Disable LTTng dependencies when building for container guest to avoid
 # lttng-modules being pulled in as a dependency.
-LTTNGUST_aglcontainerguest = ""
-LTTNGTOOLS_aglcontainerguest = ""
-LTTNGMODULES_aglcontainerguest = ""
+LTTNGUST:aglcontainerguest = ""
+LTTNGTOOLS:aglcontainerguest = ""
+LTTNGMODULES:aglcontainerguest = ""
 
 # Similarly, disable perf since it builds out of the kernel source tree.
-PERF_aglcontainerguest = ""
+PERF:aglcontainerguest = ""
index 0edf789..9d758dc 100644 (file)
@@ -24,16 +24,16 @@ inherit cmake cmake_qt5 systemd
 APP_DIR = "/opt/apps"
 EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
 
-SYSTEMD_SERVICE_${PN} = "cluster.service"
+SYSTEMD_SERVICE:${PN} = "cluster.service"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
 }
 
-FILES_${PN} += "${APP_DIR}/"
+FILES:${PN} += "${APP_DIR}/"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     qtbase \
     qtdeclarative \
     qt3d \
index 9951b2b..4374c45 100644 (file)
@@ -1,18 +1,18 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 AGL_DEFAULT_WESTONSTART ??= "/usr/bin/weston --config ${sysconfdir}/xdg/weston/weston.ini"
 WESTONARGS ?= "--idle-time=0 --drm-lease=\${DRM_LEASE_DEVICE}"
 
 WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}"
-WESTONSTART_append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
+WESTONSTART:append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
 
 WIFILES = " \
     file://drm-lease.conf.in \
 "
 
-SRC_URI_append = " ${WIFILES}"
+SRC_URI:append = " ${WIFILES}"
 
-do_install_append() {
+do_install:append() {
     # Process ".in" files
     files=$(echo ${WIFILES} | sed s,file://,,g)
     for f in ${files}; do
@@ -35,6 +35,6 @@ do_install_append() {
     ln -s ../weston@.service ${D}${systemd_system_unitdir}/multi-user.target.wants/weston@root.service
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${systemd_system_unitdir}/ \
 "
index f123f6d..327beb1 100644 (file)
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
 # Disable all other AGL provided kernel configuration (barring
 # base BSP provided configuration), and just enable a locally
index 2951d0e..27f6bfc 100644 (file)
@@ -19,7 +19,7 @@ PACKAGECONFIG = "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
 # only the example client in the guest
-PACKAGECONFIG_aglcontainerguest = "client"
+PACKAGECONFIG:aglcontainerguest = "client"
 
 # systemd integration for the server-side component
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
@@ -29,9 +29,9 @@ PACKAGECONFIG[server] = "-Dserver=true,-Dserver=false,pipewire"
 PACKAGECONFIG[client] = "-Dclient=true,-Dclient=false,"
 
 # server-side systemd service
-SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'pipewire-ic-ipc.service', '', d)}"
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'pipewire-ic-ipc.service', '', d)}"
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/pipewire/* \
     ${libdir}/pipewire-0.3/* \
 "
index 7b6af7e..82fcf4f 100644 (file)
@@ -4,4 +4,4 @@ require recipes-platform/images/agl-image-boot.inc
 
 IMAGE_LINGUAS = " "
 
-IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
+IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
index 6a17cbe..f03875b 100644 (file)
@@ -13,4 +13,4 @@ IMAGE_INSTALL += " \
     ${@bb.utils.contains('AGL_FEATURES', 'agl-drm-lease', 'drm-lease-manager', '', d)} \
 "
 
-IMAGE_INSTALL_append_rcar-gen3 = " kernel-module-gles "
+IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles "
index 11eb513..912d868 100644 (file)
@@ -56,5 +56,5 @@ do_rootfs[nostamp] = "1"
 
 ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "
 
-IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
+IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
 
index 508d0f7..fb658ea 100644 (file)
@@ -24,11 +24,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ns-commonlibrary \
index 9ca0035..a62ed6e 100644 (file)
@@ -33,9 +33,9 @@ inherit agl-basesystem-common perlnative
 
 BSMAKE_FILE = "Makefile.server"
 
-FILES_${PN} += "/usr/share/*"
+FILES:${PN} += "/usr/share/*"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ss-resourcemanager \
     agl-service-ss-loggerservice \
     agl-service-ps-communication \
index e950ed4..710dee9 100644 (file)
@@ -28,11 +28,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ss-romaccesslibrary \
index 27b2cae..fd40a39 100644 (file)
@@ -17,11 +17,11 @@ do_install() {
     install -m 644 -D ${S}/include/* ${D}${includedir}/basesystem/
 }
 
-do_install_class-native() {
+do_install:class-native() {
     install -d ${D}${bindir}
     install -m 755 -D ${S}/bin/launch_xml2cfg.sh ${D}${bindir}/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 BBCLASSEXTEND = "native"
index 4de2b70..a918ee0 100644 (file)
@@ -29,9 +29,9 @@ do_install() {
     install -m 644 ${S}/99-basesystem.rules ${D}/lib/udev/rules.d/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     launch_sm.service \
     systemd-udev-trigger.service \
     setup_refhw.service \
index bbd743a..423190b 100644 (file)
@@ -22,7 +22,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-romaccesslibrary \
     ns-frameworkunified \
index 38e3aaf..472e90b 100644 (file)
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-vehicleparameterlibrary \
     vs-positioningbaselibrary \
index 3f7af7a..b28c017 100644 (file)
@@ -15,7 +15,7 @@ S = "${WORKDIR}/Path-Tiny-${PV}"
 
 inherit cpan ptest-perl
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-file-spec \
     perl-module-file-temp \
     perl-module-test-more \
index 3f13055..3049ced 100644 (file)
@@ -14,7 +14,7 @@ S = "${WORKDIR}/XML-XPath-${PV}"
 
 inherit cpan ptest-perl
 
-do_install_append_class-native() {
+do_install:append:class-native() {
     # Fix xpath script shebang to work inside native environment
     sed -i 's|#!.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/xpath
 }
@@ -24,7 +24,7 @@ do_install_ptest() {
     install -m 0644 ${S}/examples/test.xml ${D}${PTEST_PATH}/examples/
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-carp \
     perl-module-data-dumper \
     perl-module-file-spec \
@@ -38,7 +38,7 @@ RDEPENDS_${PN} += " \
     libscalar-list-utils-perl \
 "
 
-RDEPENDS_${PN}-ptest += " \
+RDEPENDS:${PN}-ptest += " \
     libpath-tiny-perl \
 "
 
index f474e54..9ab1590 100644 (file)
@@ -16,7 +16,7 @@ inherit module
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
-RPROVIDES_${PN} += " \
+RPROVIDES:${PN} += " \
     kernel-module-evk_lib \
 "
 
index 98cf143..ffb501e 100644 (file)
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-agl-basesystem-apis \
 "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ns-backupmanager \
     agl-service-ns-notificationpersistent \
     agl-service-ps-communication \
index 85614c0..149f4ac 100644 (file)
@@ -7,13 +7,13 @@ PACKAGES = "\
     packagegroup-agl-basesystem \
 "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-image-minimal \
 "
 
-RDEPENDS_${PN}  += "\
+RDEPENDS:${PN}  += "\
     packagegroup-agl-basesystem-core \
     packagegroup-agl-basesystem-apis \
     packagegroup-agl-basesystem-service \
index 573207a..6db3ef9 100644 (file)
@@ -14,7 +14,7 @@ SRCREV := "${BASESYSTEM_REVISION}"
 
 S = "${WORKDIR}/git/service/other/rpc_library/tool"
 
-do_compile_prepend () {
+do_compile:prepend () {
     oe_runmake clean
 }
 
@@ -22,7 +22,7 @@ do_install () {
     install -D -m 755 ${S}/rpc_apidef ${D}${bindir}/rpc_apidef
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${bindir}/rpc_apidef \
 "
 
index c8e6185..10f0830 100644 (file)
@@ -12,6 +12,6 @@ BBMASK += "meta-aac/recipes-multimedia/libopus"
 
 PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"
 
-FEATURE_PACKAGES_agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa"
+FEATURE_PACKAGES:agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa"
 
 AGL_FEATURES += "agl-voiceagent-alexa"
index 736a7ce..6b0203a 100644 (file)
@@ -16,5 +16,5 @@ do_install () {
     install -D -m 644 ${WORKDIR}/voice-high.json ${D}${sysconfdir}/xdg/AGL/voice-high.json
 }
 
-RPROVIDES_${PN} += "virtual/voice-high-config"
+RPROVIDES:${PN} += "virtual/voice-high-config"
 
index a16ad18..13d259b 100644 (file)
@@ -48,4 +48,4 @@ do_install () {
     install -D -m 644 ${WORKDIR}/AlexaAutoCoreEngineConfig.json ${D}${sysconfdir}/xdg/AGL/AlexaAutoCoreEngineConfig.json
 }
 
-RPROVIDES_${PN} += "virtual/alexa-voiceagent-config"
+RPROVIDES:${PN} += "virtual/alexa-voiceagent-config"
index 580b141..c08377c 100644 (file)
@@ -38,17 +38,17 @@ EXTRA_OECMAKE += "-DAAC_HOME=${RECIPE_SYSROOT}/${AAC_PREFIX}"
 
 ALEXA_WAKEWORD ??= "false"
 
-do_install_append() {
+do_install:append() {
     install -D -m 0644 ${WORKDIR}/alexa.json ${D}${sysconfdir}/xdg/AGL/voiceagents/alexa.json
 }
 
 PACKAGES =+ "${PN}-conf"
 
-FILES_${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*"
+FILES:${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*"
 
 # NOTE: curl and opus are from the base SDK libraries, sqlite3 from the
 #       core module
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
        libcurl \
        libopus \
        libsqlite3 \
index 93b7b44..a4a0c57 100644 (file)
@@ -1,3 +1,3 @@
 # Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe
-DEPENDS_remove = "nlohmann"
-DEPENDS_append = " nlohmann-json"
+DEPENDS:remove = "nlohmann"
+DEPENDS:append = " nlohmann-json"
index 3584717..da046d0 100644 (file)
@@ -5,4 +5,4 @@ DEPENDS += "gstreamer1.0-plugins-base"
 EXTRA_OECMAKE += "-DUSE_PIPEWIRE=1"
 
 # Pull static library into appropriate package to avoid a QA error
-FILES_${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a"
+FILES:${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a"
index 620c0a5..4b5e42f 100644 (file)
@@ -1,20 +1,20 @@
 #### JAILHOUSE 
-IMAGE_INSTALL_append = " jailhouse jailhouse-demos"
+IMAGE_INSTALL:append = " jailhouse jailhouse-demos"
 PREFERRED_VERSION_linux-raspberrypi = "5.4%"
 
-RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo"
+RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/jailhouse-memory.dtbo"
 
 #Qemu Boot Config
 # qemu flags for jailhouse
-QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex -serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait"
+QB_OPT_APPEND:append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex -serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait"
 QB_MEM = "-m 2048"
 
 # use override with higher priority than x86-64
-QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
-QB_CPU_qemux86-64 = "-enable-kvm"
-QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
+QB_MACHINE:qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
+QB_CPU:qemux86-64 = "-enable-kvm"
+QB_CPU_KVM:qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
 
-QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M$0x22000000"
+QB_KERNEL_CMDLINE_APPEND:append = " intel_iommu=off memmap=82M$0x22000000"
 
 QB_KERNEL_ROOT = "/dev/vda"
 QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait -serial telnet:localhost:5432,server,nowait -vga virtio"
@@ -33,10 +33,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jailhouse-custom"
 
 # prevent most external kernel module from being built
 MOST_DRIVERS = ""
-LTTNGUST_forcevariable := ""
-LTTNGTOOLS_forcevariable := ""
-LTTNGMODULES_forcevariable := ""
+LTTNGUST:forcevariable := ""
+LTTNGTOOLS:forcevariable := ""
+LTTNGMODULES:forcevariable := ""
 
 # Disable perf build
-PERF_forcevariable := ""
+PERF:forcevariable := ""
 
index 3c652b4..5c5fc4a 100644 (file)
@@ -5,4 +5,4 @@ BBMULTICONFIG = "agl-container-guest"
 # in case of linux container is not necessary to the 'virtualization'.
 # This should be revisited when upgrading past dunfell, as less of 
 # the extra configuration may be enabled in the future.
-INHERIT_remove = "sanity-meta-virt"
+INHERIT:remove = "sanity-meta-virt"
index ab41cdb..088268a 100644 (file)
@@ -12,4 +12,4 @@ BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/system-au
 
 # For now, tweak the layer's compatibility to allow using with zeus,
 # since we know it works without major issues.
-LAYERSERIES_COMPAT_aac_append = " dunfell"
\ No newline at end of file
+LAYERSERIES_COMPAT_aac:append = " dunfell"
\ No newline at end of file