meta-arago.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone
@ 2022-02-22  4:41 Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 01/23] qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5 Denys Dmytriyenko
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This patchset uplifts meta-arago to build against the latest kirkstone
version of OE-Core and other layers. More fixes will be following.

Here's a temp git tree with these patches applied to glance at:
https://github.com/denix0/meta-arago/tree/master

Denys Dmytriyenko (23):
  qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5
  recipes: remove deprecated old platforms
  linux-libc-headers: correct the version to be 5.10
  toolchain-gcc: update preferred versions for internal toolchain
  meta-arago: convert to new override syntax in honister
  conf/machine: remove generic arago machines
  arago.conf: update curl PACKAGECONFIG
  uvc-gadget: explicitly specify source branch
  kms++: inherit pkgconfig class
  packagegroup-arago-base: remove kms++-python
  ti-test: replace kselftests with kernel-selftest
  linuxptp: make bbappend version-specific
  meta-arago: update ambiguous "BSD" license with "BSD-3-Clause"
  uboot-config: remove overlayed class
  classes: rename old customized fitimage classes for legacy HS devices
  arago.conf: drop custom class for image checksums
  meta-arago: set layer compatibility with kirkstone
  arago.conf: rename LICENSE_FLAGS_WHITELIST to LICENSE_FLAGS_ACCEPTED
  HACK: ti-test: disable input-utils due to build failure
  HACK: packagegroup-arago-tisdk-addons: disable pru-pwm-fw for am65x
  HACK: packagegroup-arago-tisdk-addons: disable pru-swuart-fw for
    am335x
  HACK: packagegroup-arago-tisdk-addons: disable pruss-lld-apps for
    AM3/4/5
  HACK: arago-image: disable make_bootfiles_symlinks_relative
    postprocess due to bashisms

 .../classes/image_types_md5.bbclass           |   9 -
 ...class => kernel-fitimage-legacyhs.bbclass} |   4 +-
 meta-arago-distro/classes/sourceipk.bbclass   |  12 +-
 .../classes/tisdk-bundle.bbclass              |  34 +-
 .../classes/uboot-config.bbclass              |  57 --
 ...gn.bbclass => uboot-sign-legacyhs.bbclass} |   6 +-
 meta-arago-distro/conf/distro/arago.conf      | 136 +++--
 .../conf/distro/include/arago-prefs.inc       |  31 +-
 .../conf/distro/include/arago-source-ipk.inc  | 485 +++++++++---------
 .../conf/distro/include/branding-amsdk.inc    |  14 +-
 .../conf/distro/include/branding-bleeding.inc |  24 +-
 .../conf/distro/include/branding-core.inc     |   8 +-
 .../conf/distro/include/branding-glsdk.inc    |   4 +-
 .../conf/distro/include/branding-mainline.inc |   4 +-
 .../distro/include/branding-processor-sdk.inc |  19 +-
 .../conf/distro/include/toolchain-arm.inc     |  16 +-
 .../conf/distro/include/toolchain-gcc.inc     |  16 +-
 meta-arago-distro/conf/layer.conf             |   5 +-
 .../conf/machine/arago-armv5.conf             |  18 -
 .../conf/machine/arago-armv7.conf             |  18 -
 .../conf/machine/arago-armv8.conf             |  21 -
 meta-arago-distro/conf/machine/arago.conf     |   1 -
 .../chromium-ozone-wayland_%.bbappend         |   6 +-
 .../arm-benchmarks/arm-benchmarks_%.bbappend  |   2 +-
 .../glmark2/glmark2_git.bbappend              |   4 +-
 .../stream/stream_%.bbappend                  |   8 +-
 .../alsa-state/alsa-state.bbappend            |   4 +-
 .../recipes-bsp/hplib/hplib-mod_git.bbappend  |   3 -
 .../k2-fw-initrd/k2-fw-initrd_0.0.7.bb        |  43 --
 .../netboot-initrd/files/init-netboot.sh      | 140 -----
 .../netboot-initrd-scripts_0.0.1.bb           |  13 -
 .../netboot-initrd/netboot-initrd_0.0.1.bb    |  47 --
 .../bt-enable/bt-enable.bb                    |   4 +-
 .../iproute2/iproute2_%.bbappend              |   6 +-
 ...uxptp_%.bbappend => linuxptp_3.0.bbappend} |   4 +-
 .../docker/docker%.bbappend                   |   4 +-
 .../arago-gpl-notice/arago-gpl-notice.bb      |   2 +-
 .../base-files/base-files_%.bbappend          |   4 +-
 .../recipes-core/busybox/busybox_%.bbappend   |   6 +-
 .../busybox/softap-udhcpd-config_1.0.bb       |   4 +-
 .../recipes-core/dbus/dbus_%.bbappend         |   2 +-
 .../feed-config/arago-feed-config_1.0.bb      |   4 +-
 .../recipes-core/images/arago-image.inc       |   4 +-
 .../recipes-core/images/tisdk-base-image.bb   |   2 +-
 .../recipes-core/images/tisdk-core-bundle.bb  |  21 +-
 .../recipes-core/images/tisdk-core-bundle.inc |  26 +-
 .../images/tisdk-default-image.bb             |   7 +-
 .../recipes-core/images/tisdk-tiny-image.bb   |   2 +-
 .../init-ifupdown/init-ifupdown_%.bbappend    |   4 +-
 .../meta/external-arm-toolchain.bbappend      |   8 +-
 .../meta/meta-toolchain-arago-tisdk.inc       |   2 +-
 .../packagegroups/build-essential.bb          |   2 +-
 ...kagegroup-arago-base-tisdk-server-extra.bb |  82 +--
 .../packagegroup-arago-base-tisdk.bb          |   2 +-
 .../packagegroups/packagegroup-arago-base.bb  |   8 +-
 .../packagegroup-arago-console.bb             |   4 +-
 .../packagegroup-arago-gst-sdk-target.bb      |   9 +-
 .../packagegroups/packagegroup-arago-gst.bb   |  13 +-
 .../packagegroups/packagegroup-arago-misc.bb  |   2 +-
 .../packagegroups/packagegroup-arago-qte.bb   |  26 +-
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb |  64 +--
 ...kagegroup-arago-tisdk-addons-sdk-target.bb | 162 +-----
 .../packagegroup-arago-tisdk-addons.bb        |  79 +--
 ...packagegroup-arago-tisdk-amsdk-sdk-host.bb |  14 +-
 .../packagegroup-arago-tisdk-amsdk.bb         |   6 +-
 ...oup-arago-tisdk-connectivity-sdk-target.bb |   6 +-
 .../packagegroup-arago-tisdk-connectivity.bb  |  14 +-
 ...ackagegroup-arago-tisdk-crypto-sdk-host.bb |  15 +-
 ...kagegroup-arago-tisdk-crypto-sdk-target.bb |   9 +-
 .../packagegroup-arago-tisdk-crypto.bb        |   9 +-
 ...kagegroup-arago-tisdk-graphics-sdk-host.bb |   2 +-
 ...gegroup-arago-tisdk-graphics-sdk-target.bb |   2 +-
 .../packagegroup-arago-tisdk-graphics.bb      |   4 +-
 ...packagegroup-arago-tisdk-gtk-sdk-target.bb |   2 +-
 .../packagegroup-arago-tisdk-gtk.bb           |   2 +-
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  10 +-
 .../packagegroup-arago-tisdk-hmi.bb           |  10 +-
 ...ackagegroup-arago-tisdk-matrix-sdk-host.bb |   2 +-
 .../packagegroup-arago-tisdk-matrix.bb        |  34 +-
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb |  14 +-
 ...group-arago-tisdk-multimedia-sdk-target.bb |  18 +-
 .../packagegroup-arago-tisdk-multimedia.bb    |  18 +-
 ...ackagegroup-arago-tisdk-opencl-sdk-host.bb |   8 +-
 ...kagegroup-arago-tisdk-opencl-sdk-target.bb |   8 +-
 .../packagegroup-arago-tisdk-opencl.bb        |  11 +-
 .../packagegroup-arago-tisdk-qte-sdk-host.bb  |  11 +-
 .../packagegroup-arago-tisdk-qte.bb           |  18 +-
 .../packagegroup-arago-tisdk-recoveryfs.bb    |  21 -
 ...ckagegroup-arago-toolchain-tisdk-target.bb |   5 +-
 .../packagegroup-cross-canadian.bbappend      |   4 +-
 .../packagegroups/ti-analytics.bb             |   9 +-
 .../recipes-core/packagegroups/ti-demos.bb    |  10 +-
 .../recipes-core/packagegroups/ti-opencl.bb   |   4 +-
 .../recipes-core/packagegroups/ti-test.bb     | 101 +---
 .../recipes-core/packagegroups/ti-world.bb    |   8 +-
 .../recipes-core/psplash/psplash_git.bbappend |   6 +-
 .../recipes-core/systemd/systemd_%.bbappend   |  14 +-
 .../recipes-core/sysvinit/sysvinit_%.bbappend |   8 +-
 .../recipes-core/thermal-init/thermal-init.bb |   2 +-
 .../recipes-core/udev/eudev_%.bbappend        |   8 +-
 .../recipes-devtools/cmake/cmake_%.bbappend   |   4 +-
 .../recipes-devtools/perl/perl_%.bbappend     |   2 +-
 .../recipes-devtools/php/php_%.bbappend       |  16 +-
 .../recipes-devtools/pm-qa/pm-qa_%.bbappend   |   4 +-
 .../python/python3_%.bbappend                 |   2 +-
 .../recipes-extended/bash/bash_%.bbappend     |   2 +-
 .../shadow/shadow-securetty_%.bbappend        |   4 +-
 .../recipes-graphics/cairo/cairo_%.bbappend   |   4 +-
 .../recipes-graphics/drm/libdrm_%.bbappend    |   6 +-
 .../freetype/freetype_%.bbappend              |   2 +-
 .../kmscube/kmscube_%.bbappend                |   4 +-
 .../recipes-graphics/tslib/tslib_%.bbappend   |   4 +-
 .../wayland/wayland-ivi-extension_2.2.0.bb    |  10 +-
 .../wayland/weston-init.bbappend              |  10 +-
 .../wayland/weston_9.0.0.bbappend             |   4 +-
 .../cryptodev/cryptodev-module_%.bbappend     |   2 +-
 .../kexec/kexec-tools_%.bbappend              |   6 +-
 .../linux-firmware/linux-firmware_%.bbappend  |  16 +-
 ...ders_5.4.bb => linux-libc-headers_5.10.bb} |   2 +-
 .../recipes-kernel/linux/copy-defconfig.inc   |   4 +-
 .../recipes-kernel/linux/docker.inc           |   2 +-
 .../linux/linux-ti-staging-rt_%.bbappend      |   6 +-
 .../linux/linux-ti-staging-systest_%.bbappend |   6 +-
 .../linux/linux-ti-staging_%.bbappend         |   6 +-
 .../ffmpeg/ffmpeg_%.bbappend                  |   4 +-
 .../gstreamer/gstreamer1.0-plugins-%.bbappend |   4 +-
 .../libtiff/tiff_%.bbappend                   |   4 +-
 .../net-snmp/net-snmp_%.bbappend              |   8 +-
 .../examples/qtwebbrowser_1.0.bbappend        |   4 +-
 .../recipes-qt/qt5/qtbase-conf_1.0.bb         |   2 +-
 .../recipes-qt/qt5/qtbase_%.bbappend          |  12 +-
 .../recipes-qt/qt5/qtdeclarative_git.bbappend |   6 +-
 .../recipes-qt/qt5/qtwayland_git.bbappend     |   4 +-
 .../recipes-qt/qt5/qtwebengine_git.bbappend   |   4 +-
 .../recipes-qt/qt5/qtwebkit_%.bbappend        |   8 +-
 .../recipes-support/gnutls/gnutls_%.bbappend  |   2 +-
 .../libnl/libnl_3.5.0.bbappend                |   4 +-
 .../rng-tools/rng-tools_%.bbappend            |   6 +-
 .../strongswan/strongswan_%.bbappend          |   6 +-
 .../syslog-ng/syslog-ng_%.bbappend            |   4 +-
 .../opencl-examples-rtos_git.bbappend         |   2 +-
 .../recipes-tisdk/parse-ip/parse-ip.bb        |   6 +-
 .../ti-tisdk-makefile/Makefile_ipsecmgr-mod   |  28 -
 .../ti-tisdk-makefile/Makefile_pru-icss       |  13 -
 .../ti-tisdk-makefile_1.0.bb                  | 124 ++---
 .../ti-tisdk-setup/ti-tisdk-setup.bb          |  25 +-
 .../tisdk-install/tisdk-install_1.0.bb        |   2 +-
 .../tisdk-readme/tisdk-readme.bb              |   2 +-
 .../recipes-tisdk/tisdk-uenv/tisdk-uenv.bb    |   2 +-
 .../unshallow-repositories_1.0.bb             |   4 +-
 meta-arago-extras/classes/qt-provider.bbclass |  13 -
 meta-arago-extras/classes/qt-vars.bbclass     |  17 -
 meta-arago-extras/classes/qt5.bbclass         |   2 +-
 meta-arago-extras/conf/layer.conf             |   6 +-
 .../barcode-demo/barcode-roi_git.bb           |   4 +-
 .../big-data-ipc-demo-linux_git.bb            |   6 +-
 .../big-data-ipc-demo/big-data-ipc-demo.inc   |  15 +-
 .../recipes-apps/evse-hmi/evse-hmi_git.bb     |   2 +-
 .../image-gallery/image-gallery_git.bb        |   8 +-
 .../mmwavegesture-hmi_git.bb                  |   2 +-
 .../pdm-anomaly-detection_git.bb              |   4 +-
 .../point-cloud-viewer_git.bb                 |   6 +-
 .../posix-smp-demo/posix-smp-demo.inc         |  20 -
 .../posix-smp-demo/posix-smp-demo_git.bb      |  16 -
 .../protection-relays-hmi_git.bb              |   2 +-
 .../thermostat-demo/qt-tstat_2.0.bb           |  15 +-
 ...-opencv-opencl-opengl-multithreaded_git.bb |   6 +-
 .../arm-benchmarks/arm-benchmarks_1.3.bb      |   2 +-
 .../recipes-benchmark/stream/stream_5.10.bb   |   2 +-
 .../switch-config/switch-config_git.bb        |   4 +-
 .../hostap/hostap-daemon-wl18xx.bb            |  10 +-
 .../recipes-connectivity/hostap/hostap.inc    |   2 +-
 .../open62541/open62541_git.bb                |  14 +-
 .../openntpd/openntpd_3.9p1.bb                |   2 +-
 .../recipes-connectivity/vtun/vtun_3.0.3.bb   |   2 +-
 .../wpa-supplicant/wpa-supplicant-wl18xx.bb   |  14 +-
 .../wpa-supplicant/wpa-supplicant.inc         |  14 +-
 .../recipes-core/am-sysinfo/am-sysinfo_git.bb |   4 +-
 .../recipes-core/llvm/llvm-common.bb          |   6 +-
 .../recipes-core/llvm/llvm-common.bbappend    |   4 +-
 meta-arago-extras/recipes-core/llvm/llvm.inc  |  30 +-
 .../recipes-core/llvm/ti-llvm3.6_3.6.bb       |  22 +-
 .../matrix/matrix-gui-3d-demos_2.0.bb         |  86 ++--
 .../matrix/matrix-gui-analytics-demos_2.0.bb  |   8 +-
 .../matrix/matrix-gui-apps-git.inc            |   2 +-
 .../matrix/matrix-gui-apps-images_2.0.bb      |   2 +-
 .../recipes-core/matrix/matrix-gui-apps.inc   |   2 +-
 .../matrix-gui-armbenchmarks-demos_2.0.bb     |   6 +-
 .../matrix/matrix-gui-browser-demos_2.0.bb    |   6 +-
 .../matrix/matrix-gui-browser_2.0.bb          |  18 +-
 .../matrix/matrix-gui-camera-loopback_2.0.bb  |   4 +-
 .../matrix/matrix-gui-clocks_2.0.bb           |   8 +-
 .../matrix/matrix-gui-crypto-demos_2.0.bb     |  16 +-
 .../matrix/matrix-gui-display-control_2.0.bb  |   4 +-
 .../matrix/matrix-gui-ethernet-demos_2.0.bb   |   8 +-
 .../matrix/matrix-gui-helper-scripts.bb       |   4 +-
 .../matrix/matrix-gui-hmi-demos_2.0.bb        |  20 +-
 .../matrix-gui-machinevision-demos_2.0.bb     |  28 +-
 .../matrix/matrix-gui-mc-demos_2.0.bb         |  12 +-
 .../matrix/matrix-gui-multimedia-demos_2.0.bb |  74 +--
 .../matrix/matrix-gui-opencl-demos_2.0.bb     |  20 +-
 .../matrix/matrix-gui-oprofile-demos_2.0.bb   |   4 +-
 .../matrix/matrix-gui-pm-demos_2.0.bb         |  28 +-
 .../matrix/matrix-gui-pru-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-qt4-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-qt5-demos_2.0.bb        |  22 +-
 .../matrix/matrix-gui-settings-demos_2.0.bb   |   8 +-
 .../matrix/matrix-gui-submenus_2.0.bb         |  52 +-
 .../matrix/matrix-gui-tidl-demos_2.0.bb       |  62 +--
 .../matrix/matrix-gui-touch-demos_2.0.bb      |   4 +-
 .../matrix/matrix-gui-usb-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-utility-demos_2.0.bb    |  10 +-
 .../matrix/matrix-gui-v4l2-demos_2.0.bb       |   4 +-
 .../matrix-gui-video-analytics-demos_2.0.bb   |   4 +-
 .../matrix/matrix-gui-wifi-demos_2.0.bb       |   4 +-
 .../recipes-core/matrix/matrix-gui/php.ini    |   2 +-
 .../recipes-core/matrix/matrix-gui_2.0.bb     |  20 +-
 .../matrix/matrix-lighttpd-config.bb          |   8 +-
 .../recipes-core/matrix/refresh-screen_2.0.bb |   7 +-
 .../meta/external-arm-sdk-toolchain.bb        |  32 +-
 .../meta/external-arm-toolchain.bbappend      |  20 +-
 .../meta/meta-toolchain-arago-qte.bb          |  10 +-
 .../recipes-core/meta/meta-toolchain-arago.bb |   2 +-
 .../oprofile-example/oprofile-example_git.bb  |   2 +-
 ...k-packagegroup-arago-qte-toolchain-host.bb |   7 +-
 ...nativesdk-packagegroup-arago-tisdk-host.bb |   4 +-
 ...packagegroup-arago-qte-toolchain-target.bb |  40 +-
 ...ackagegroup-arago-standalone-sdk-target.bb |   3 +-
 .../ti-crypto-examples_git.bb                 |   2 +-
 .../ti-pru-sw-app-loader_1.00.00.bb           |   6 +-
 .../ti-pru-sw-edma-library_1.00.00.bb         |   8 +-
 .../ti-pru-sw-examples_1.00.00.bb             |  10 +-
 .../cmake/extra-cmake-modules.bb              |   4 +-
 .../cpuloadgen/cpuloadgen_git.bb              |   2 +-
 .../recipes-devtools/dt/dt_17.07.bb           |   2 +-
 .../eventdump/eventdump_git.bb                |   2 +-
 .../flash-utility-1.6.0.0/LICENSE             |  63 ---
 .../flash-utility/flash-utility_1.6.0.0.bb    |  35 --
 .../flatbuffers/flatbuffers_1.11.0.bb         |   6 +-
 .../input-utils/input-utils_1.0.bb            |   2 +-
 .../ltp-ddt/ltp-ddt_20210524.bb               |  16 +-
 .../mtd/mtd-utils_git.bbappend                |   8 +-
 .../recipes-devtools/omapconf/omapconf_git.bb |   2 +-
 .../opkg/opkg-bash-completion.bb              |   4 +-
 .../pinmux-utility_1.0.1076.3.bb              |   4 +-
 .../pinmux-utility/pinmux-utility_2.5.2.0.bb  |   6 +-
 .../recipes-devtools/statcol/statcol.bb       |   6 +-
 .../util-scripts/glsdk-util-scripts.bb        |   4 +-
 .../uvc-gadget/uvc-gadget_git.bb              |   2 +-
 .../websocketd/websocketd_0.4.1.bb            |   2 +-
 .../recipes-extended/ltp/ltp_20200120.bb      |  20 +-
 .../recipes-extended/ltp/ltp_20210524.bb      |  20 +-
 .../recipes-graphics/glfw/glfw_git.bb         |   2 +-
 .../glsdk-example-apps/glsdk-example-apps.bb  |   8 +-
 .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb          |  10 +-
 .../recipes-graphics/kms++/kms++_git.bb       |   8 +-
 .../ti-gc320-tests_5.0.11.p7.bb               |   4 +-
 .../tslib/ts-calibrate-init_1.0.bb            |   2 +-
 .../wayland/wayland-protocols_%.bbappend      |   6 +-
 .../recovery-kernel/recovery-kernel_1.0.bb    |  46 --
 .../timestamping/timestamping_4.1.bb          |   2 +-
 .../amsdk-av-files/amsdk-av-files_1.4.bb      |  16 +-
 .../av-examples/av-examples_1.0.bb            |  34 --
 .../demo-image-proc/demo-image-proc_git.bb    |  26 -
 .../dual-camera-demo/dual-camera-demo_1.0.bb  |  14 +-
 .../gstreamer1.0-plugins-dsp66_git.bb         |  18 +-
 .../gstreamer1.0-plugins-ducati_git.bb        |   2 +-
 .../gstreamer1.0-plugins-hevc_git.bb          |  10 +-
 .../gstreamer1.0-plugins-ti.inc               |   6 +-
 .../gstreamer1.0-plugins-bad_1.16.%.bbappend  |  18 +-
 .../gstreamer1.0-plugins-good_1.18.%.bbappend |   6 +-
 .../hevc-arm-decoder/hevc-arm-decoder_git.bb  |   6 +-
 .../recipes-qt/examples/qtwebbrowser_1.0.bb   |   6 +-
 .../arm-compute-library_git.bb                |  12 +-
 .../recipes-support/cclink/ccief-basic_git.bb |   2 +-
 .../crash-recovery/crash-recovery.bb          |  19 -
 .../crash-recovery/files/recoveryfs.sh        |  44 --
 .../recipes-support/devmem2/devmem2.bbappend  |   2 +-
 .../ipsecmgr/ipsecmgr-mod_git.bb              |  22 -
 .../recipes-support/ipsecmgr/ipsecmgr.inc     |   6 -
 .../recipes-support/ipsecmgr/ipsecmgr_git.bb  |  35 --
 .../libnl-xfrm/libnl-xfrm_git.bb              |  44 --
 .../recipes-support/liboil/liboil_0.3.17.bb   |   2 +-
 .../recipes-support/mstpctl/mstpd_git.bb      |   4 +-
 .../tensorflow-lite-demo_git.bb               |   8 +-
 .../tensorflow-lite/tensorflow-lite_1.15.bb   |  14 +-
 .../recipes-ti/fftlib/fftlib_git.bb           |  11 +-
 .../recipes-ti/fftlib/ti-fftw-examples_git.bb |   6 +-
 .../recipes-ti/fftlib/ti-fftw_git.bb          |  11 +-
 .../libarch/libarch-examples_git.bb           |   8 +-
 .../recipes-ti/libarch/libarch.inc            |   5 +-
 .../recipes-ti/libarch/libarch_git.bb         |   6 +-
 .../recipes-ti/linalg/linalg-examples_git.bb  |   8 +-
 .../recipes-ti/linalg/linalg.inc              |   2 +-
 .../recipes-ti/linalg/linalg_git.bb           |  14 +-
 .../recipes-ti/llvm-rtos/llvm-rtos_git.bb     |   6 +-
 .../recipes-ti/netapi/netapi-test_git.bb      |  51 --
 .../recipes-ti/netapi/netapi.inc              |  33 --
 .../recipes-ti/netapi/netapi_git.bb           |  32 --
 .../recipes-ti/ocl-rtos/clocl-rtos_git.bb     |   6 +-
 .../recipes-ti/ocl-rtos/clocl-win_git.bb      |   4 +-
 .../ocl-rtos/opencl-examples-rtos_git.bb      |   6 +-
 .../ocl-rtos/opencl-monitor-rtos_git.bb       |  10 +-
 .../recipes-ti/ocl-rtos/opencl-rtos_git.bb    |  16 +-
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb |  10 +-
 ...ondition-during-DSP-firmware-booting.patch |  38 --
 .../recipes-ti/ocl/ocl-gl-headers_git.bb      |   2 +-
 meta-arago-extras/recipes-ti/ocl/ocl.inc      |   2 +-
 .../recipes-ti/ocl/opencl-examples_git.bb     |  40 +-
 .../recipes-ti/ocl/opencl-monitor-ipu_git.bb  |   8 +-
 .../recipes-ti/ocl/opencl-monitor_git.bb      |  63 +--
 .../recipes-ti/ocl/opencl-tidl-fw_git.bb      |   4 +-
 .../recipes-ti/ocl/opencl_git.bb              |  39 +-
 .../recipes-ti/openmpacc/clacc_git.bb         |   8 +-
 .../openmpacc/openmpacc-examples_git.bb       |  10 +-
 .../recipes-ti/openmpacc/openmpacc.inc        |   8 +-
 .../recipes-ti/openmpacc/openmpacc_git.bb     |   6 +-
 .../recipes-ti/tidl-api/tidl-api.inc          |   4 +-
 .../recipes-ti/tidl-api/tidl-api_git.bb       |   8 +-
 .../recipes-ti/tidl-api/tidl-examples_git.bb  |   8 +-
 .../recipes-ti/tidl-api/tidl-viewer_git.bb    |  12 +-
 .../recipes-ti/tidl-utils/tidl-import_git.bb  |   4 +-
 .../recipes-ti/tidl-utils/tidl-utils.bb       |  12 +-
 .../recipes-ti/tiovx/tiovx-app-host.bb        |  16 +-
 .../recipes-ti/tiovx/tiovx-lib-host.bb        |   6 +-
 .../recipes-ti/tiovx/tiovx-sys-iface.bb       |  10 +-
 326 files changed, 1543 insertions(+), 3331 deletions(-)
 delete mode 100644 meta-arago-distro/classes/image_types_md5.bbclass
 rename meta-arago-distro/classes/{kernel-fitimage.bbclass => kernel-fitimage-legacyhs.bbclass} (99%)
 delete mode 100644 meta-arago-distro/classes/uboot-config.bbclass
 rename meta-arago-distro/classes/{uboot-sign.bbclass => uboot-sign-legacyhs.bbclass} (97%)
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv5.conf
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv7.conf
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv8.conf
 delete mode 120000 meta-arago-distro/conf/machine/arago.conf
 delete mode 100644 meta-arago-distro/recipes-bsp/hplib/hplib-mod_git.bbappend
 delete mode 100644 meta-arago-distro/recipes-bsp/k2-fw-initrd/k2-fw-initrd_0.0.7.bb
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/files/init-netboot.sh
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd-scripts_0.0.1.bb
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd_0.0.1.bb
 rename meta-arago-distro/recipes-connectivity/linuxptp/{linuxptp_%.bbappend => linuxptp_3.0.bbappend} (88%)
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-recoveryfs.bb
 rename meta-arago-distro/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.4.bb => linux-libc-headers_5.10.bb} (97%)
 delete mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
 delete mode 100644 meta-arago-extras/classes/qt-provider.bbclass
 delete mode 100644 meta-arago-extras/classes/qt-vars.bbclass
 delete mode 100644 meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo.inc
 delete mode 100644 meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo_git.bb
 mode change 100755 => 100644 meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
 delete mode 100644 meta-arago-extras/recipes-devtools/flash-utility/flash-utility-1.6.0.0/LICENSE
 delete mode 100644 meta-arago-extras/recipes-devtools/flash-utility/flash-utility_1.6.0.0.bb
 delete mode 100644 meta-arago-extras/recipes-kernel/recovery-kernel/recovery-kernel_1.0.bb
 delete mode 100644 meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
 delete mode 100644 meta-arago-extras/recipes-multimedia/demo-image-proc/demo-image-proc_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/crash-recovery/crash-recovery.bb
 delete mode 100755 meta-arago-extras/recipes-support/crash-recovery/files/recoveryfs.sh
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/libnl-xfrm/libnl-xfrm_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi-test_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi.inc
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/ocl/files/0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch

-- 
2.25.1


^ permalink raw reply	[flat|nested] 24+ messages in thread

* [PATCH 01/23] qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 02/23] recipes: remove deprecated old platforms Denys Dmytriyenko
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Qt4 has been long since deprecated, so there's no need for this abstraction.
Update corresponding recipes that used these classes and variables.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/conf/distro/arago.conf      |  3 --
 .../conf/distro/include/branding-amsdk.inc    |  2 -
 .../packagegroups/packagegroup-arago-qte.bb   | 26 +-----------
 .../packagegroup-arago-tisdk-connectivity.bb  | 12 ------
 .../packagegroup-arago-tisdk-qte-sdk-host.bb  | 11 +----
 .../packagegroup-arago-tisdk-qte.bb           | 18 +--------
 .../ti-tisdk-makefile_1.0.bb                  |  8 ----
 meta-arago-extras/classes/qt-provider.bbclass | 13 ------
 meta-arago-extras/classes/qt-vars.bbclass     | 17 --------
 .../recipes-apps/evse-hmi/evse-hmi_git.bb     |  2 +-
 .../image-gallery/image-gallery_git.bb        |  2 +-
 .../mmwavegesture-hmi_git.bb                  |  2 +-
 .../pdm-anomaly-detection_git.bb              |  2 +-
 .../protection-relays-hmi_git.bb              |  2 +-
 .../thermostat-demo/qt-tstat_2.0.bb           | 11 ++---
 ...-opencv-opencl-opengl-multithreaded_git.bb |  2 +-
 .../matrix/matrix-gui-browser_2.0.bb          | 16 ++------
 .../recipes-core/matrix/matrix-gui_2.0.bb     | 12 +++---
 .../recipes-core/matrix/refresh-screen_2.0.bb |  5 +--
 .../meta/meta-toolchain-arago-qte.bb          |  8 +---
 ...k-packagegroup-arago-qte-toolchain-host.bb |  5 ++-
 ...packagegroup-arago-qte-toolchain-target.bb | 40 +------------------
 ...ackagegroup-arago-standalone-sdk-target.bb |  1 -
 .../dual-camera-demo/dual-camera-demo_1.0.bb  |  6 +--
 .../recipes-qt/examples/qtwebbrowser_1.0.bb   |  2 +-
 25 files changed, 34 insertions(+), 194 deletions(-)
 delete mode 100644 meta-arago-extras/classes/qt-provider.bbclass
 delete mode 100644 meta-arago-extras/classes/qt-vars.bbclass
 mode change 100755 => 100644 meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index bf96c54e..ed067a38 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -109,9 +109,6 @@ VIRTUAL-RUNTIME_login_manager = "busybox shadow"
 
 DISTRO_FEATURES_append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
 
-# Set preferred Qt version
-QT_PROVIDER ?= "qt5"
-
 # Distro-specific package configuration
 PACKAGECONFIG_append_pn-systemd = " coredump"
 
diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
index 3f3c5e44..6a4dd47b 100644
--- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc
+++ b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
@@ -1,7 +1,5 @@
 ARAGO_TISDK_IMAGE = "arago-amsdk-image"
 
-QT_PROVIDER := "${@bb.utils.contains('SOC_FAMILY','omap-a15:dra7xx','qt5','qt4e',d)}"
-
 PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "sitara-linux-ti-staging"
 PREFERRED_PROVIDER_virtual/kernel_am437x-evm = "sitara-linux-ti-staging"
 PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index bf8124da..3d69ba81 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -6,27 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-QT4_SGX_SUPPORT = "\
-    qt4-embedded-plugin-gfxdriver-gfxpvregl \
-    libqt-embeddedopengl4 \
-    libqt-embeddedpvrqwswsegl4 \
-"
-
-QT4_ESSENTIALS = "\
-    qt4-embedded \
-    qt4-embedded-plugin-mousedriver-tslib \
-    qt4-embedded-plugin-gfxdriver-gfxtransformed \
-    qt4-embedded-plugin-phonon-backend-gstreamer \
-    qt4-embedded-plugin-imageformat-gif \
-    qt4-embedded-plugin-imageformat-jpeg \
-    qt4-embedded-qml-plugins \
-    libqt-embeddedmultimedia4 \
-    libqt-embeddeddeclarative4 \
-    libqt-embeddedxmlpatterns4 \
-    ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', '${QT4_SGX_SUPPORT}', '', d)} \
-"
-
-QT5_ESSENTIALS = "\
+RDEPENDS_${PN} = "\
     qtbase-plugins \
     qtdeclarative-qmlplugins \
     qtlocation-plugins \
@@ -45,7 +25,3 @@ QT5_ESSENTIALS = "\
     qtconnectivity \
     qtconnectivity-qmlplugins \
 "
-
-RDEPENDS_${PN} = "\
-    ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 707c1bac..50c4ea25 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -51,10 +51,6 @@ BT_TI = "\
     bt-fw \
 "
 
-DEMO_APPS = "\
-    ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'wpa-gui-e', d)} \
-"
-
 #    net-snmp
 #    net-snmp-server-snmpd
 CONNECTIVITY_RDEPENDS = " \
@@ -69,14 +65,6 @@ CONNECTIVITY_RDEPENDS = " \
     ${BT_TI} \
 "
 
-CONNECTIVITY_RDEPENDS_append_ti33x = "\
-    ${DEMO_APPS} \
-"
-
-CONNECTIVITY_RDEPENDS_append_ti43x = "\
-    ${DEMO_APPS} \
-"
-
 RDEPENDS_${PN} = "\
     ${CONNECTIVITY_RDEPENDS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
index bcfa202f..d3b55e85 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
@@ -6,15 +6,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-QT4_DEMOS = "\
-    ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-source', '', d)} \
-"
-
-QT_DEMOS = "\
-    qt-tstat-source \
-"
-
 RDEPENDS_${PN} = "\
-    ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', "${QT4_DEMOS}", d)} \
-    ${QT_DEMOS} \
+    qt-tstat-source \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index 7498dd2e..d1a9ae3c 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -8,14 +8,9 @@ inherit packagegroup features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-QT4_DEMOS = "\
-    qt4-embedded-examples \
-    qt4-embedded-demos \
-    ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
-"
-
 #    qtdeclarative-examples
-QT5_DEMOS = "\
+RDEPENDS_${PN} = "\
+    packagegroup-arago-qte \
     qtbase-examples \
     qtdeclarative-tools \
     qtlocation-examples \
@@ -25,14 +20,5 @@ QT5_DEMOS = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
     qtserialport-examples \
     qtcharts-examples \
-"
-
-QT_DEMOS = "\
     qt-tstat \
 "
-
-RDEPENDS_${PN} = "\
-    packagegroup-arago-qte \
-    ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEMOS}", "${QT4_DEMOS}", d)} \
-    ${QT_DEMOS} \
-"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 4474b861..30e51386 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -27,7 +27,6 @@ SRC_URI = "\
     file://Makefile_pru \
     file://Makefile_ti-ocf-crypto-module \
     file://Makefile_qt-tstat \
-    file://Makefile_quick-playground \
     file://Makefile_omapconf \
     file://Makefile_oprofile-example \
     file://Makefile_dual-camera-demo \
@@ -76,13 +75,9 @@ MAKEFILES_COMMON = "linux \
 "
 MAKEFILES = ""
 
-# This example application should not be used when using non-SGX
-QUICK_PLAYGROUND = "${@oe.utils.conditional('ARAGO_QT_PROVIDER','qt4-embedded-gles','quick-playground','', d)}"
-
 # Add device specific make targets
 
 MAKEFILES_append_omap3 = " u-boot-spl \
-                           ${QUICK_PLAYGROUND} \
 "
 MAKEFILES_append_am37x-evm = " av-examples \
                                ti-ocf-crypto-module \
@@ -91,7 +86,6 @@ MAKEFILES_append_am3517-evm = " av-examples \
                                 ti-ocf-crypto-module \
 "
 MAKEFILES_append_ti33x = " u-boot-spl \
-                           ${QUICK_PLAYGROUND} \
                            ti-crypto-examples \
                            linux-dtbs \
                            cryptodev \
@@ -102,7 +96,6 @@ MAKEFILES_append_ti33x = " u-boot-spl \
                            pdm-anomaly-detection \
 "
 MAKEFILES_append_ti43x = " u-boot-spl \
-                           ${QUICK_PLAYGROUND} \
                            ti-crypto-examples \
                            linux-dtbs \
                            cryptodev \
@@ -127,7 +120,6 @@ MAKEFILES_append_dra7xx = " cryptodev \
 "
 
 MAKEFILES_append_omap-a15 = " u-boot-spl \
-                              ${QUICK_PLAYGROUND} \
                               omapconf \
                               linux-dtbs \
                               ti-sgx-ddk-km \
diff --git a/meta-arago-extras/classes/qt-provider.bbclass b/meta-arago-extras/classes/qt-provider.bbclass
deleted file mode 100644
index 40ec7a07..00000000
--- a/meta-arago-extras/classes/qt-provider.bbclass
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class to handle switching between Qt4 and Qt5
-# Usage:
-# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5"
-#    It defaults to "qt4e" when not set
-#    Hasn't been tested with "qt4x11" but should theoretically work
-# 2. Update recipes to inherit qt-provider instead of qt4e directly
-# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_* variables
-#    instead of the actual Qt-version specific values
-
-QT_PROVIDER ?= "qt5"
-
-inherit ${QT_PROVIDER}
-inherit qt-vars
diff --git a/meta-arago-extras/classes/qt-vars.bbclass b/meta-arago-extras/classes/qt-vars.bbclass
deleted file mode 100644
index 5a8cc798..00000000
--- a/meta-arago-extras/classes/qt-vars.bbclass
+++ /dev/null
@@ -1,17 +0,0 @@
-# Class to define many useful variables that differ between Qt4 and Qt5
-
-QT_PROVIDER ?= "qt5"
-
-# Build-time dependencies - those are now separate modules in Qt5 and
-# require separate dependencies, unlike Qt4 that provides everything
-# in a single qt4-embedded/qt4-x11 recipe
-QT_DEPENDS_BASE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}"
-QT_DEPENDS_WEBKIT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
-QT_DEPENDS_SVG = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}"
-QT_DEPENDS_SCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}"
-QT_DEPENDS_WEBENGINE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtwebengine', '', d)}"
-
-# Run-time dependencies
-QT_RDEPENDS_FONTS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'qt4-embedded-fonts', d)}"
-QT_RDEPENDS_NATIVESDK_TOOLS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'nativesdk-qtbase nativesdk-qttools', 'nativesdk-qt4-tools', d)}"
-QT_RDEPENDS_MKSPECS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtbase-mkspecs', 'qt4-embedded-mkspecs', d)}"
diff --git a/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb b/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb
index e2d7b882..a5083999 100644
--- a/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb
+++ b/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "HMI demo for electronic vehicle charging station (EVSE) using QT QWid
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104"
 
-inherit qt-provider
+inherit qt5
 
 PV = "1.0"
 PR = "r1"
diff --git a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
index 26a567bc..2a9750da 100644
--- a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
+++ b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c57cc1cdee589f97cbba69e95a89a15"
 
 require recipes-core/matrix/matrix-gui-paths.inc
 
-inherit qt-provider
+inherit qt5
 
 PR = "r5"
 
diff --git a/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb b/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
index ff6b02a8..d5f9e43c 100644
--- a/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
+++ b/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Gesture baed HMI demo using mmWave IWR1642 chip and Sitara AM device"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=e7e749ff1989b18db836e5d9910a37e9"
 
-inherit qt-provider
+inherit qt5
 
 PV = "1.0"
 PR = "r0"
diff --git a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
index 266cabd9..e4f43f1d 100644
--- a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
+++ b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Predictive maintenance demo for anomaly detection using Recurrent Neu
 LICENSE = "BSD-3-Clause & MIT & GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e88016d2cbc82d0d2efbb0865891e9d6"
 
-inherit qt-provider
+inherit qt5
 
 PV = "1.0"
 PR = "r2"
diff --git a/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb b/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
old mode 100755
new mode 100644
index a0c7321f..018859e0
--- a/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
+++ b/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "HMI demo for Protection Relays using QT  tools"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104"
 
-inherit qt-provider
+inherit qt5
 
 PV = "1.0"
 PR = "r0"
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
index ba96fa60..a0f2c937 100644
--- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
 
 require recipes-core/matrix/matrix-gui-paths.inc
 
-inherit qt-provider
+inherit qt5
 
 PR = "r10"
 
-DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
+DEPENDS += "qtsvg qtscript"
 
 BRANCH ?= "master"
 SRCREV = "665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1"
@@ -23,19 +23,16 @@ SRC_URI = "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANC
 
 S = "${WORKDIR}/git"
 
-DESKTOP_FILE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}"
-
-
 do_install() {
 	install -d ${D}/usr/bin
 	install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
 	install -d ${D}${MATRIX_APP_DIR}/qt_tstat
 	install ${S}/matrix-files/desc_thermostat_demo.html  ${D}${MATRIX_APP_DIR}/qt_tstat
-	install ${S}/matrix-files/${DESKTOP_FILE}  ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
+	install ${S}/matrix-files/thermostat_demo_qt5.desktop  ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
 }
 
 PACKAGES += "matrix-gui-thermostat-demo"
 
-RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images ${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', 'matrix-gui-submenus-qt4', d)}"
+RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt5"
 
 FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
diff --git a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
index 7d2fb51c..9a25e911 100644
--- a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
+++ b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
@@ -23,7 +23,7 @@ SRCREV = "80051ec8befd921e40cfb74a49234ed045576bbc"
 
 S = "${WORKDIR}/git"
 
-inherit qt-provider
+inherit qt5
 
 export TARGET_ROOTDIR = "${STAGING_DIR_HOST}"
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index 44f66d0d..c9440628 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -3,24 +3,14 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
 SECTION = "multimedia"
 
-inherit qt-provider
+inherit qt5
 
-# Make sure that QT font libraries have been installed
-RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
-
-DEPENDS += "${QT_DEPENDS_WEBKIT}"
-#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}"
-#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}"
+DEPENDS += "qtwebkit"
 
 PR = "r17"
 
-QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79"
-QT5_SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
-#QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc"
-#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
-
+SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
 
-SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}"
 BRANCH ?= "master"
 
 SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index b9c0637c..4c9c5386 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -16,22 +16,24 @@ inherit systemd
 BRANCH ?= "master"
 SRCREV = "9a2d12590102fefc5c29fc9e8d346ce6b0198468"
 
-MATRIX_INITSCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', bb.utils.contains('DISTRO_FEATURES', 'wayland', 'init', 'init.eglfs', d), 'init', d)}"
+MATRIX_INITSCRIPT = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'init', 'init.eglfs', d)}"
 
 SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \
            file://${MATRIX_INITSCRIPT} \
            file://php.ini \
            file://matrix-gui-2.0.service \
-           ${@oe.utils.conditional('QT_PROVIDER', 'qt5', bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d), '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', \
+                'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d)} \
 "
 
 require matrix-gui-paths.inc
 
 S = "${WORKDIR}/git"
 
-MATRIX_FLAGS = "${@oe.utils.conditional('QT_PROVIDER','qt5','','-qws',d)}"
-SWITCH_FOREGROUND_VT = "${@oe.utils.conditional('QT_PROVIDER','qt5','','chvt 4',d)}"
+MATRIX_FLAGS = ""
+SWITCH_FOREGROUND_VT = ""
+
 do_install(){
 	install -d ${D}${MATRIX_BASE_DIR}
 	install -d ${D}${MATRIX_WEB_DIR}
diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
index 9e214f42..10dfada9 100644
--- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
@@ -3,10 +3,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
 SECTION = "multimedia"
 
-inherit qt-provider
-
-# Make sure that QT font libraries have been installed
-RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
+inherit qt5
 
 PR = "r9"
 
diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
index d3139398..f0cefb0d 100644
--- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
+++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
@@ -7,12 +7,8 @@ require meta-toolchain-arago.bb
 
 PR = "r20"
 
-# There could be qt5, qt4e and qt4x11 providers, but we don't support qt4x11 for now
-QT_DIR_NAME = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'qtopia', d)}"
-QT_BIN_PREFIX = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', '', d)}"
-QT_BIN_SUFFIX = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', '4', d)}"
-QT_MKSPECS_LOCATION = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${libdir}", "${datadir}", d)}"
-QT_MKSPECS_DIR = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "linux-oe-g++", "linux-gnueabi-oe-g++", d)}"
+QT_MKSPECS_LOCATION = "${libdir}"
+QT_MKSPECS_DIR = "linux-oe-g++"
 
 toolchain_create_sdk_env_script_append() {
 	echo 'export PATH=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_DIR_NAME}:$PATH' >> $script
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
index dbf9038d..1498f70d 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Host packages for Qt Embedded SDK"
 PR = "r10"
 LICENSE = "MIT"
 
-inherit packagegroup qt-vars nativesdk
+inherit packagegroup nativesdk
 
 RDEPENDS_${PN} = "\
     nativesdk-packagegroup-arago-tisdk-host \
-    ${QT_RDEPENDS_NATIVESDK_TOOLS} \
+    nativesdk-qtbase \
+    nativesdk-qttools \
     "
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index c40b4532..f14877e0 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -7,41 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-QT4_SGX_SUPPORT = "\
-        libqt-embeddedopengl4-dev \
-        libqt-embeddedpvrqwswsegl4-dev \
-"
-
-QT4_DEV = " \
-        packagegroup-arago-standalone-sdk-target \
-        qt4-embedded-mkspecs \
-        libqt-embeddedmultimedia4-dev \
-        libqt-embeddedphonon4-dev \
-        libqt-embedded3support4-dev \
-        libqt-embeddedclucene4-dev \
-        libqt-embeddedcore4-dev \
-        libqt-embeddeddbus4-dev \
-        libqt-embeddeddesignercomponents4-dev \
-        libqt-embeddeddesigner4-dev \
-        libqt-embeddeduitools4-dev \
-        libqt-embeddedgui4-dev \
-        libqt-embeddedhelp4-dev \
-        libqt-embeddednetwork4-dev \
-        libqt-embeddedscript4-dev \
-        libqt-embeddedscripttools4-dev \
-        libqt-embeddedsql4-dev \
-        libqt-embeddedsvg4-dev \
-        libqt-embeddedtest4-dev \
-        libqt-embeddedwebkit4-dev \
-        libqt-embeddedxml4-dev \
-        libsqlite3-dev \
-        libqt-embeddedxmlpatterns4-dev \
-        libqt-embeddedmultimedia4-dev \
-        libqt-embeddeddeclarative4-dev \
-        ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles','${QT4_SGX_SUPPORT}', '', d)} \
-"
-
-QT5_DEV = " \
+RDEPENDS_${PN} += " \
         packagegroup-arago-standalone-sdk-target \
         libsqlite3-dev \
         qtbase-mkspecs \
@@ -69,7 +35,3 @@ QT5_DEV = " \
         qtcharts-mkspecs \
         qtcharts-dev \
 "
-
-RDEPENDS_${PN} += " \
-        ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
-"
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
index 2a1d29b6..936ed17c 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
@@ -26,7 +26,6 @@ RDEPENDS_${PN} = "\
     opkg-dev \
     libpng-dev \
     readline-dev \
-    ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'tslib-dev', d)} \
     libusb-compat-dev \
     libusb1-dev \
     zlib-dev \
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
index 66746793..eaa52a7b 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
@@ -21,9 +21,7 @@ SRC_URI = "git://git.ti.com/sitara-linux/dual-camera-demo.git;protocol=git;branc
 
 S = "${WORKDIR}/git"
 
-DEMO_SCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'dual_camera_qt5.sh', 'dual_camera_qt4.sh', d)}"
-
-inherit qt-provider
+inherit qt5
 
 export SDK_PATH_TARGET='${STAGING_DIR_HOST}'
 
@@ -32,7 +30,7 @@ do_install() {
     install -d ${D}/usr/bin
     install -d ${D}${MATRIX_APP_DIR}/dual-camera
     install dual_camera ${D}/usr/bin/dual_camera
-    install ${WORKDIR}/${DEMO_SCRIPT} ${D}/usr/bin/dual_camera.sh
+    install ${WORKDIR}/dual_camera_qt5.sh ${D}/usr/bin/dual_camera.sh
     install ${WORKDIR}/desc_dual-camera.html ${D}/${MATRIX_APP_DIR}/dual-camera
     install ${WORKDIR}/dual-camera.desktop ${D}/${MATRIX_APP_DIR}/dual-camera
 }
diff --git a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
index c32ec22c..59372b05 100644
--- a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
+++ b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://code.qt.io/qt-apps/qtwebbrowser.git;protocol=git;branch=${BRANC
 
 S = "${WORKDIR}/git"
 
-inherit qt-provider
+inherit qt5
 
 # Install qtwebbrowser under /usr/bin
 do_install() {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 02/23] recipes: remove deprecated old platforms
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 01/23] qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5 Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 03/23] linux-libc-headers: correct the version to be 5.10 Denys Dmytriyenko
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Specific recipes and overrides in shared recipes were removed for these:
OMAP3/4/5
AM35xx/AM37xx
Keystone2/K2HK/K2E/K2L/K2G

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../classes/tisdk-bundle.bbclass              |  26 +---
 meta-arago-distro/conf/distro/arago.conf      |  16 --
 .../conf/distro/include/arago-prefs.inc       |  11 --
 .../conf/distro/include/arago-source-ipk.inc  |  27 ----
 .../distro/include/branding-processor-sdk.inc |   3 -
 .../recipes-bsp/hplib/hplib-mod_git.bbappend  |   3 -
 .../k2-fw-initrd/k2-fw-initrd_0.0.7.bb        |  43 ------
 .../netboot-initrd/files/init-netboot.sh      | 140 ------------------
 .../netboot-initrd-scripts_0.0.1.bb           |  13 --
 .../netboot-initrd/netboot-initrd_0.0.1.bb    |  47 ------
 .../recipes-core/images/tisdk-core-bundle.bb  |   5 -
 .../recipes-core/images/tisdk-core-bundle.inc |  10 +-
 .../images/tisdk-default-image.bb             |   1 -
 ...kagegroup-arago-base-tisdk-server-extra.bb |  80 ----------
 .../packagegroups/packagegroup-arago-base.bb  |   4 -
 .../packagegroup-arago-gst-sdk-target.bb      |   5 -
 .../packagegroups/packagegroup-arago-gst.bb   |   5 -
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb |  28 ----
 ...kagegroup-arago-tisdk-addons-sdk-target.bb | 134 -----------------
 .../packagegroup-arago-tisdk-addons.bb        |  29 ----
 ...packagegroup-arago-tisdk-amsdk-sdk-host.bb |   4 -
 ...ackagegroup-arago-tisdk-crypto-sdk-host.bb |   5 -
 ...kagegroup-arago-tisdk-crypto-sdk-target.bb |   1 -
 .../packagegroup-arago-tisdk-crypto.bb        |   1 -
 .../packagegroup-arago-tisdk-matrix.bb        |   6 -
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb |   2 -
 ...group-arago-tisdk-multimedia-sdk-target.bb |   6 -
 .../packagegroup-arago-tisdk-multimedia.bb    |   4 -
 ...ackagegroup-arago-tisdk-opencl-sdk-host.bb |   4 -
 ...kagegroup-arago-tisdk-opencl-sdk-target.bb |   4 -
 .../packagegroup-arago-tisdk-opencl.bb        |   5 -
 .../packagegroup-arago-tisdk-recoveryfs.bb    |  21 ---
 ...ckagegroup-arago-toolchain-tisdk-target.bb |   1 -
 .../packagegroups/ti-analytics.bb             |   1 -
 .../recipes-core/packagegroups/ti-test.bb     |  79 ----------
 .../recipes-tisdk/parse-ip/parse-ip.bb        |   2 +-
 .../ti-tisdk-makefile/Makefile_ipsecmgr-mod   |  28 ----
 .../ti-tisdk-makefile/Makefile_pru-icss       |  13 --
 .../ti-tisdk-makefile_1.0.bb                  |  48 ------
 .../ti-tisdk-setup/ti-tisdk-setup.bb          |   7 -
 meta-arago-extras/conf/layer.conf             |   1 -
 .../big-data-ipc-demo/big-data-ipc-demo.inc   |  11 +-
 .../posix-smp-demo/posix-smp-demo.inc         |  20 ---
 .../posix-smp-demo/posix-smp-demo_git.bb      |  16 --
 .../matrix/matrix-gui-3d-demos_2.0.bb         |   2 +-
 .../matrix-gui-armbenchmarks-demos_2.0.bb     |   2 +-
 .../matrix/matrix-gui-crypto-demos_2.0.bb     |   6 -
 .../matrix/matrix-gui-utility-demos_2.0.bb    |   2 -
 .../flash-utility-1.6.0.0/LICENSE             |  63 --------
 .../flash-utility/flash-utility_1.6.0.0.bb    |  35 -----
 .../pinmux-utility/pinmux-utility_2.5.2.0.bb  |   2 +-
 .../recovery-kernel/recovery-kernel_1.0.bb    |  46 ------
 .../amsdk-av-files/amsdk-av-files_1.4.bb      |   6 -
 .../av-examples/av-examples_1.0.bb            |  34 -----
 .../demo-image-proc/demo-image-proc_git.bb    |  26 ----
 .../gstreamer1.0-plugins-dsp66_git.bb         |   2 +-
 .../gstreamer1.0-plugins-hevc_git.bb          |   2 +-
 .../hevc-arm-decoder/hevc-arm-decoder_git.bb  |   2 +-
 .../crash-recovery/crash-recovery.bb          |  19 ---
 .../crash-recovery/files/recoveryfs.sh        |  44 ------
 .../ipsecmgr/ipsecmgr-mod_git.bb              |  22 ---
 .../recipes-support/ipsecmgr/ipsecmgr.inc     |   6 -
 .../recipes-support/ipsecmgr/ipsecmgr_git.bb  |  35 -----
 .../libnl-xfrm/libnl-xfrm_git.bb              |  44 ------
 .../recipes-ti/fftlib/fftlib_git.bb           |   3 +-
 .../recipes-ti/fftlib/ti-fftw_git.bb          |   3 +-
 .../recipes-ti/libarch/libarch.inc            |   3 +-
 .../recipes-ti/linalg/linalg.inc              |   2 +-
 .../recipes-ti/linalg/linalg_git.bb           |   2 -
 .../recipes-ti/netapi/netapi-test_git.bb      |  51 -------
 .../recipes-ti/netapi/netapi.inc              |  33 -----
 .../recipes-ti/netapi/netapi_git.bb           |  32 ----
 ...ondition-during-DSP-firmware-booting.patch |  38 -----
 .../recipes-ti/ocl/opencl-examples_git.bb     |   4 +-
 .../recipes-ti/ocl/opencl-monitor_git.bb      |  47 +-----
 .../recipes-ti/ocl/opencl_git.bb              |  11 +-
 76 files changed, 18 insertions(+), 1531 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-bsp/hplib/hplib-mod_git.bbappend
 delete mode 100644 meta-arago-distro/recipes-bsp/k2-fw-initrd/k2-fw-initrd_0.0.7.bb
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/files/init-netboot.sh
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd-scripts_0.0.1.bb
 delete mode 100644 meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd_0.0.1.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-recoveryfs.bb
 delete mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
 delete mode 100644 meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo.inc
 delete mode 100644 meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo_git.bb
 delete mode 100644 meta-arago-extras/recipes-devtools/flash-utility/flash-utility-1.6.0.0/LICENSE
 delete mode 100644 meta-arago-extras/recipes-devtools/flash-utility/flash-utility_1.6.0.0.bb
 delete mode 100644 meta-arago-extras/recipes-kernel/recovery-kernel/recovery-kernel_1.0.bb
 delete mode 100644 meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
 delete mode 100644 meta-arago-extras/recipes-multimedia/demo-image-proc/demo-image-proc_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/crash-recovery/crash-recovery.bb
 delete mode 100755 meta-arago-extras/recipes-support/crash-recovery/files/recoveryfs.sh
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
 delete mode 100644 meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
 delete mode 100644 meta-arago-extras/recipes-support/libnl-xfrm/libnl-xfrm_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi-test_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi.inc
 delete mode 100644 meta-arago-extras/recipes-ti/netapi/netapi_git.bb
 delete mode 100644 meta-arago-extras/recipes-ti/ocl/files/0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch

diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index 4ebfb5dc..ac2eb747 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -59,13 +59,7 @@ DEPLOY_IMAGES_NAME ?= ""
 DEPLOY_SPL_UART_NAME ?= "u-boot-spl.bin-${MACHINE}"
 
 # Variable to specify the name of the TI SCI firmware
-DEPLOY_TISCI_FW_NAME ?= "ti-sci-firmware-k2g.bin"
-
-# Variable to specify the name of Keystone skern file (it has SOC in the name, not MACHINE)
-DEPLOY_K2_SKERN_NAME ?= "skern-*.bin"
-
-# Variable to specify the name of Keystone initramfs with FW images
-DEPLOY_K2_FW_INITRD_NAME ?= "k2-fw-initrd.cpio.gz"
+DEPLOY_TISCI_FW_NAME ?= ""
 
 # Manifest file location which will be created as part of the image build
 # process.
@@ -865,24 +859,6 @@ tisdk_image_build () {
         fi
     fi
 
-    # Copy skern/boot-monitor image if it exists
-    if [ "${DEPLOY_K2_SKERN_NAME}" != "" ]
-    then
-        if [ -e ${DEPLOY_DIR_IMAGE}/${DEPLOY_K2_SKERN_NAME} ]
-        then
-            cp ${DEPLOY_DIR_IMAGE}/${DEPLOY_K2_SKERN_NAME} ${prebuilt_dir}/
-        fi
-    fi
-
-    # Copy Keystone FW initramfs image if it exists
-    if [ "${DEPLOY_K2_FW_INITRD_NAME}" != "" ]
-    then
-        if [ -e ${DEPLOY_DIR_IMAGE}/${DEPLOY_K2_FW_INITRD_NAME} ]
-        then
-            cp ${DEPLOY_DIR_IMAGE}/${DEPLOY_K2_FW_INITRD_NAME} ${prebuilt_dir}/
-        fi
-    fi
-
     # Add the EXTRA_TISDK_FILES contents if they exist
     # Make sure EXTRA_TISDK_FILES is not empty so we don't accidentaly
     # copy the root directory.
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index ed067a38..35741ea9 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -56,22 +56,6 @@ KERNEL_IMAGETYPES_am64xx-hs-evm = "Image fitImage"
 KERNEL_IMAGETYPES_j7-hs-evm = "Image fitImage"
 KERNEL_IMAGETYPES_j7200-hs-evm = "Image fitImage"
 
-KERNEL_IMAGETYPES_k2e-hs-evm = "zImage fitImage"
-INITRAMFS_IMAGE_k2e-hs-evm = "k2-fw-initrd"
-INITRAMFS_FSTYPES_k2e-hs-evm = "cpio.gz"
-
-KERNEL_IMAGETYPES_k2hk-hs-evm = "zImage fitImage"
-INITRAMFS_IMAGE_k2hk-hs-evm = "k2-fw-initrd"
-INITRAMFS_FSTYPES_k2hk-hs-evm = "cpio.gz"
-
-KERNEL_IMAGETYPES_k2g-hs-evm = "zImage fitImage"
-INITRAMFS_IMAGE_k2g-hs-evm = "k2-fw-initrd"
-INITRAMFS_FSTYPES_k2g-hs-evm = "cpio.gz"
-
-KERNEL_IMAGETYPES_k2l-hs-evm = "zImage fitImage"
-INITRAMFS_IMAGE_k2l-hs-evm = "k2-fw-initrd"
-INITRAMFS_FSTYPES_k2l-hs-evm = "cpio.gz"
-
 # Extra boot files for WIC images
 do_image_wic[depends] += "tisdk-uenv:do_deploy"
 IMAGE_BOOT_FILES += "uEnv.txt"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index a356c76c..2bf9f103 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -21,15 +21,6 @@ PREFERRED_PROVIDER_virtual/libgles2_j7 = "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm_j7 = "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver_j7 = "ti-img-rogue-driver"
 
-# This is required when using keystone devices with graphical support
-# such as Qt5
-PREFERRED_PROVIDER_virtual/egl_keystone = "mesa"
-PREFERRED_PROVIDER_virtual/libgles1_keystone = "mesa"
-PREFERRED_PROVIDER_virtual/libgles2_keystone = "mesa"
-PREFERRED_PROVIDER_virtual/libgbm_keystone = "mesa"
-PREFERRED_PROVIDER_virtual/libgl_keystone = "mesa"
-PREFERRED_PROVIDER_virtual/mesa_keystone = "mesa"
-
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging${ARAGO_KERNEL_SUFFIX}"
 
 # For TI devices with only baremetal/TI RTOS support
@@ -43,8 +34,6 @@ PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 PREFERRED_VERSION_crda = "3.18"
 PREFERRED_VERSION_obex = "0.34"
 
-PREFERRED_PROVIDER_libnl-xfrm = "libnl"
-
 PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
 #PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
 #PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
index d4122339..22484cf4 100644
--- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
+++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
@@ -109,9 +109,6 @@ SRCIPK_INSTALL_DIR_pn-ti-pru-sw-examples ?= "example-applications/pru-${PV}"
 CREATE_SRCIPK_pn-ti-ocf-crypto-module ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-ocf-crypto-module ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-omap3-sgx-modules ?= "1"
-SRCIPK_INSTALL_DIR_pn-omap3-sgx-modules ?= "board-support/extra-drivers/sgx-modules-${PV}"
-
 CREATE_SRCIPK_pn-ti-compat-wireless-wl18xx ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-compat-wireless-wl18xx ?= "board-support/extra-drivers/${PN}-${PV}"
 
@@ -126,22 +123,11 @@ SRCIPK_INSTALL_DIR_pn-av-examples ?= "example-applications/av-examples-${PV}"
 
 CREATE_SRCIPK_pn-u-boot ?= "1"
 SRCIPK_INSTALL_DIR_pn-u-boot ?= "board-support/u-boot-${PV}"
-# For beagleboard we use the git version which doesn't define UVER
-SRCIPK_INSTALL_DIR_pn-u-boot_beagleboard ?= "board-support/${P}"
-
-CREATE_SRCIPK_pn-x-load ?= "1"
-SRCIPK_INSTALL_DIR_pn-x-load ?= "board-support/x-load-${XVER}-psp${PSPREL}"
-# For beagleboard we use the git version which doesn't define XVER
-SRCIPK_INSTALL_DIR_pn-x-load_beagleboard ?= "board-support/${P}"
 
 CREATE_SRCIPK_pn-u-boot-ti-staging ?= "1"
 SRCIPK_INSTALL_DIR_pn-u-boot-ti-staging ?= "board-support/u-boot-${PV}${UBOOT_LOCALVERSION}"
 SRCIPK_PRESERVE_GIT_pn-u-boot-ti-staging ?= "true"
 
-CREATE_SRCIPK_pn-u-boot-keystone ?= "1"
-SRCIPK_INSTALL_DIR_pn-u-boot-keystone ?= "board-support/u-boot-${PV}"
-SRCIPK_PRESERVE_GIT_pn-u-boot-keystone ?= "true"
-
 CREATE_SRCIPK_pn-u-boot-dra7xx ?= "1"
 SRCIPK_INSTALL_DIR_pn-u-boot-dra7xx ?= "board-support/u-boot-${PV}-${PR}"
 
@@ -170,10 +156,6 @@ SRCIPK_PRESERVE_GIT_pn-sitara-linux-ti-staging ?= "true"
 SRCIPK_SHALLOW_CLONE_pn-sitara-linux-ti-staging ?= "true"
 SRCIPK_SHALLOW_DEPTH_pn-sitara-linux-ti-staging ?= "400"
 
-CREATE_SRCIPK_pn-linux-keystone ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-keystone ?= "board-support/linux-${PV}"
-SRCIPK_PRESERVE_GIT_pn-linux-keystone ?= "true"
-
 CREATE_SRCIPK_pn-linux-am335x-psp ?= "1"
 SRCIPK_INSTALL_DIR_pn-linux-am335x-psp ?= "board-support/linux-${KVER}"
 
@@ -215,18 +197,12 @@ SRCIPK_INSTALL_DIR_pn-ti-linux-driver-examples ?= "example-applications/linux-dr
 CREATE_SRCIPK_pn-ti-linux-driver-examples-omapl ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-linux-driver-examples-omapl ?= "example-applications/linux-driver-examples-${PV}"
 
-CREATE_SRCIPK_pn-ti-linux-driver-examples-omap3 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-linux-driver-examples-omap3 ?= "example-applications/linux-driver-examples-${PV}"
-
 CREATE_SRCIPK_pn-ti-framework-components ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-framework-components ?= "component-sources/framework_components_${PV}"
 
 CREATE_SRCIPK_pn-ti-codec-engine ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-codec-engine ?= "component-sources/codec_engine_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-omap3530 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-omap3530 ?= "codecs-omap3530_${PV}"
-
 CREATE_SRCIPK_pn-ti-linuxutils ?= "1"
 SRCIPK_INSTALL_DIR_pn-ti-linuxutils ?= "component-sources/linuxutils_${PV}"
 
@@ -373,9 +349,6 @@ SRCIPK_INSTALL_DIR_pn-hplib-mod ?= "board-support/extra-drivers/${PN}-${PV}"
 CREATE_SRCIPK_pn-uio-module-drv ?= "1"
 SRCIPK_INSTALL_DIR_pn-uio-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ipsecmgr-mod ?= "1"
-SRCIPK_INSTALL_DIR_pn-ipsecmgr-mod ?= "board-support/extra-drivers/${PN}-${PV}"
-
 CREATE_SRCIPK_pn-pru-icss ?= "1"
 SRCIPK_INSTALL_DIR_pn-pru-icss ?= "example-applications/${PN}-${PV}"
 
diff --git a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
index cd79078e..166e259a 100644
--- a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
+++ b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
@@ -32,6 +32,3 @@ SRCIPK_SHALLOW_DEPTH_pn-linux-ti-staging = "400"
 
 SRCIPK_CUSTOM_GIT_BRANCH_pn-u-boot-ti-staging = "processor-sdk-local"
 SRCIPK_CUSTOM_GIT_MESSAGE_pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
-
-# Temporarily disable UBI images for K2 "server" rootfs due to size
-IMAGE_FSTYPES_remove_pn-tisdk-server-rootfs-image = "ubi ubifs"
diff --git a/meta-arago-distro/recipes-bsp/hplib/hplib-mod_git.bbappend b/meta-arago-distro/recipes-bsp/hplib/hplib-mod_git.bbappend
deleted file mode 100644
index ac946dbe..00000000
--- a/meta-arago-distro/recipes-bsp/hplib/hplib-mod_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PR_append = ".arago0"
-
-SRCIPK_SRC_DIR = "${WORKDIR}/git/ti/runtime/hplib"
diff --git a/meta-arago-distro/recipes-bsp/k2-fw-initrd/k2-fw-initrd_0.0.7.bb b/meta-arago-distro/recipes-bsp/k2-fw-initrd/k2-fw-initrd_0.0.7.bb
deleted file mode 100644
index b9eb57fe..00000000
--- a/meta-arago-distro/recipes-bsp/k2-fw-initrd/k2-fw-initrd_0.0.7.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Prebuilt Keystone2 initramfs with SerDes, QMSS and NETCP PA firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c5e02be633f1499c109d1652514d85ec"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "keystone"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "http://arago-project.org/files/releases/k2-fw/k2-initramfs-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "27fb248cbfe08ed8344bdc4451067c8f"
-SRC_URI[sha256sum] = "beb19d685ee0d20281266726e4c2ba4b245af9450c1bd5155ff06d8c1656dd26"
-
-S = "${WORKDIR}"
-TARGET = "k2-fw-initrd.cpio.gz"
-TARGETM = "k2-fw-initrd-${MACHINE}.cpio.gz"
-
-do_install() {
-	install -d ${D}/boot
-	install -m 0644 ${S}/${TARGET} ${D}/boot/${TARGETM}
-	ln -s ${TARGETM} ${D}/boot/${TARGET}
-}
-
-FILES_${PN} = "/boot"
-
-inherit deploy
-
-do_deploy() {
-	install -d ${DEPLOYDIR}
-	install -m 0644 ${S}/${TARGET} ${DEPLOYDIR}/${TARGETM}
-	ln -s ${TARGETM} ${DEPLOYDIR}/${TARGET}
-}
-
-addtask deploy before do_build after do_compile
-
-do_image_complete() {
-	:
-}
-
-addtask image_complete after do_deploy before do_build
diff --git a/meta-arago-distro/recipes-bsp/netboot-initrd/files/init-netboot.sh b/meta-arago-distro/recipes-bsp/netboot-initrd/files/init-netboot.sh
deleted file mode 100644
index 2d8792bd..00000000
--- a/meta-arago-distro/recipes-bsp/netboot-initrd/files/init-netboot.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-export PATH=$PATH:/sbin:/usr/sbin
-
-early_setup() {
-    mkdir -p /proc /sys /tmp /run
-    mount -t proc proc /proc
-    mount -t sysfs sysfs /sys
-    mount -t devtmpfs none /dev
-}
-
-beginswith() { case $2 in "$1"*) true;; *) false;; esac; }
-
-read_args() {
-    for arg in $2; do
-        if beginswith "$1=" $arg ; then
-		optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
-		echo  $optarg
-		break
-	fi
-    done
-}
-
-parse_server_info() {
-    info=$1
-    ip=$(echo $info | cut -s -d':' -f1 )
-    info=${info#$ip:}
-    path=$(echo $info | cut -d',' -f1 )
-    info=${info#$path}
-    options=${info#,}
-
-    eval "$2=$ip"
-    eval "$3=$path"
-    eval "$4=$options"
-}
-
-do_dhcp() {
-	if [ "$1" != "" ] ; then
-		udhcpc -i $1
-	else
-		udhcpc
-	fi
-}
-
-configure_eth_dev() {
-	conf=$1
-
-	client_ip=$(echo $conf | cut -s -d':' -f 1)
-	server_ip=$(echo $conf | cut -s -d':' -f 2)
-	gw_ip=$(echo $conf | cut -s -d':' -f 3)
-	netmask=$(echo $conf | cut -s -d':' -f 4)
-	hostname=$(echo $conf | cut -s -d':' -f 5)
-	device=$(echo $conf | cut -s -d':' -f 6)
-	autoconf=$(echo $conf | cut -s -d':' -f 7)
-	dns0_ip=$(echo $conf | cut -s -d':' -f 8)
-	dns1_ip=$(echo $conf | cut -s -d':' -f 9)
-
-	if [ "$device" == "" ]; then
-		device="eth0";
-	fi
-
-	echo waiting for device $device to come up
-	while [ -z "$(ip link show $device 2> /dev/null)" ] ; do
-		echo .;
-		sleep 1
-	done
-	echo done
-
-
-	ip link set $device up
-	echo waiting establishment of link on $device
-	while [ -z "$(ip link show $device | grep '<*LOWER_UP*>')" ] ; do
-		echo .;
-		sleep 1
-	done
-	echo done
-
-	#handle the case 'ip=dhcp'
-	if [ "$conf" == "dhcp" ] ; then
-		do_dhcp
-		return $?
-	fi
-
-	#handle the 'autoconf' case
-	if [ "$autoconf" == "dhcp" ] ; then
-		do_dhcp $device
-		return $?
-	fi
-
-	if [ "$netmask" != "" ]; then
-		ip addr add $client_ip/$netmask dev $device
-	else
-		ip addr add $client_ip dev $device
-	fi
-
-	if [ "$gw_ip" != "" ] ; then
-		ip route add default via $gw_ip
-	fi
-	if [ "$dns0_ip" != "" ] ; then
-		echo $dns0_ip >> /etc/resolv.conf
-	fi
-	if [ "$dns1_ip" != "" ] ; then
-		echo $dns1_ip >> /etc/resolv.conf
-	fi
-}
-
-early_setup
-udevd --daemon
-udevadm trigger
-udevadm settle
-
-cmdline=$(cat /proc/cmdline)
-
-root_dev=$(read_args  root "$cmdline")
-server_info=$(read_args nfsroot "$cmdline")
-ip_info=$(read_args ip "$cmdline")
-
-if [ "$root_dev" != "/dev/nfs" ]; then
-	echo "invalid root device. It must be /dev/nfs"
-	exit 1
-fi
-
-#
-configure_eth_dev $ip_info
-parse_server_info $server_info ip path options
-
-#default options: "nolock"
-if [ -z "$options" ] ; then
-	options="nolock"
-fi
-
-#busybox mount doesn't recognize 'v3' as a valid option. replace it with nfsvers=3
-options=$(echo $options | sed 's/\<v3\>/nfsvers=3/g')
-
-# mount NFS drive
-mkdir /newroot
-mount -t nfs -o $options $ip:$path /newroot
-
-# switch root. new root is the NFS mount
-exec switch_root /newroot /sbin/init
diff --git a/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd-scripts_0.0.1.bb b/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd-scripts_0.0.1.bb
deleted file mode 100644
index f1ab0d5a..00000000
--- a/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd-scripts_0.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Simple init script that triggers udev and mount a NFS root filesystem described in kernel command line"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRC_URI = "file://init-netboot.sh"
-
-do_install() {
-        install -m 0755 ${WORKDIR}/init-netboot.sh ${D}/init
-}
-
-inherit allarch
-
-FILES_${PN} += " /init "
diff --git a/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd_0.0.1.bb b/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd_0.0.1.bb
deleted file mode 100644
index c774af0a..00000000
--- a/meta-arago-distro/recipes-bsp/netboot-initrd/netboot-initrd_0.0.1.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "Initramfs image for NFS boot"
-DESCRIPTION = "Small image capable of mounting a newtwork root filesystem (NFS)"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-PR = "r1"
-
-inherit core-image image_types
-
-#by default include the kernel modules necessary to use a ASIX USB/Ethernet adapter
-NETBOOT_KERNEL_MODULES ?= "dwc3 dwc3-omap asix xhci-plat-hcd extcon-usb-gpio phy-omap-usb2"
-
-export IMAGE_BASENAME = "netboot-initramfs"
-
-#generate an image that can be loaded by u-boot
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES} ${INITRAMFS_FSTYPES}.u-boot"
-
-# include udev (used to load the kernel modules)
-VIRTUAL-RUNTIME_dev_manager = "udev"
-
-# List of packages to install
-IMAGE_INSTALL = "\
-  bash \
-  busybox \
-  udev \
-  netboot-initrd-scripts\
-  "
-
-# add the required kernel modules
-IMAGE_INSTALL += "${@' '.join(['kernel-module-'+x for x in d.getVar('NETBOOT_KERNEL_MODULES').split()])}"
-
-# Reduce the size of the rootfs by removing features
-
-# Do not include buysbox's syslog
-BAD_RECOMMENDATIONS += "busybox-syslog"
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-# Keep extra language files from being installed
-IMAGE_LINGUAS = ""
-
-# To further reduce the size of the rootfs, remove the /boot directory from the final image
-# this is usually done by adding RDEPENDS_kernel-base = "" in the configuration file. In our case we can't use
-# this method. Instead we just wipe out the content of "/boot" before creating the image.
-ROOTFS_POSTPROCESS_COMMAND += "empty_boot_dir; "
-empty_boot_dir () {
-	rm -rf ${IMAGE_ROOTFS}/boot/*
-}
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
index 253bfbb6..636464b6 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
@@ -1,11 +1,6 @@
 require tisdk-core-bundle.inc
 
 DEPLOY_SPL_NAME_omapl138 = ""
-DEPLOY_SPL_NAME_k2hk = ""
-DEPLOY_SPL_NAME_k2l = ""
-DEPLOY_SPL_NAME_k2e = ""
-# Only unset it for HS device, as k2g GP does provide MLO/SPL
-DEPLOY_SPL_NAME_k2g-hs-evm = ""
 DEPLOY_SPL_NAME_k3 = "tispl.bin tiboot3.bin"
 
 DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
index 9f0e65db..823402ad 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
@@ -7,7 +7,7 @@ IMAGE_NAME_SUFFIX = ""
 
 inherit tisdk-bundle
 
-COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap-a15|keystone|k3"
+COMPATIBLE_MACHINE = "omapl138|ti33x|ti43x|omap-a15|k3"
 
 # List of packages to remove from the host package.  This is usually due to
 # licensing issues and unneeded dependencies.
@@ -18,15 +18,10 @@ TOOLCHAIN_CLEANUP_PACKAGES = "libgnutls-dev libgnutls-extra26 libgnutls-openssl2
 # picking up DTB files for devices with no DTB support.
 DTB_FILTER = "unknown"
 DTB_FILTER_ti33x = "am335x"
-DTB_FILTER_omap5-evm = "omap5"
 DTB_FILTER_dra7xx-evm = "dra7"
 DTB_FILTER_am57xx-evm = "am57xx"
 DTB_FILTER_am57xx-hs-evm = "${DTB_FILTER_am57xx-evm}"
 DTB_FILTER_ti43x = "am43"
-DTB_FILTER_k2hk = "k2hk"
-DTB_FILTER_k2l = "k2l"
-DTB_FILTER_k2e = "k2e"
-DTB_FILTER_k2g = "k2g"
 DTB_FILTER_omapl138 = "da850"
 DTB_FILTER_am65xx = "am65"
 DTB_FILTER_j7 = "j721e"
@@ -34,9 +29,6 @@ DTB_FILTER_j7 = "j721e"
 # List of target side images to build for the SDK
 TARGET_IMAGES = "tisdk-base-image tisdk-default-image"
 
-# dra71 lcard requires an initramfs with modules for NFS boot
-TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd"
-
 TISDK_TOOLCHAIN = "${@bb.utils.contains('MACHINE_FEATURES','gpu','meta-toolchain-arago-tisdk','meta-toolchain-arago-tisdk-server',d)}"
 TOOLCHAIN_SUFFIX = "${@bb.utils.contains('MACHINE_FEATURES','gpu','-tisdk','-tisdk-server',d)}"
 
diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index 152f8572..efac8d44 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -30,7 +30,6 @@ export IMAGE_BASENAME = "tisdk-default-image"
 
 # Disable ubi/ubifs as the filesystem requires more space than is
 # available on the HW.
-IMAGE_FSTYPES_remove_keystone = "ubifs ubi"
 IMAGE_FSTYPES_remove_omapl138 = "ubifs ubi"
 
 # Below is the delta in packages between old fuller and a new smaller default rootfs
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
index 86bef4cf..0628b630 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
@@ -23,89 +23,9 @@ ARAGO_NDISC6 = "\
     ndisc6-tracert6 \
     "
 
-# ipsecmgr has been disabled for a while
-# disable ipsecmgr-mod,hplib-mod due to K4.14 API changes
-#    ipsecmgr-mod
-#    hplib-mod
-ARAGO_TI_KEYSTONE_PKGS = "\
-    uio-module-drv \
-    traceframework \
-    cuia \
-    libnl-xfrm \
-    udma \
-    cuia \
-    edma3-lld \
-    srss-tc \
-    cmem \
-    cmem-mod \
-    ti-ipc \
-    mpm-transport \
-    multiprocmgr \
-    rm-lld \
-    qmss-lld \
-    pktlib \
-    cppi-lld \
-    parse-ip \
-    "
-
-# The following packages are not yet ready for k2g-evm
-#    netapi
-#    netapi-test
-#    hplib
-#    nwal-lld
-
-ARAGO_TI_PKGS = ""
-ARAGO_TI_PKGS_append_keystone = " ${ARAGO_TI_KEYSTONE_PKGS}"
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi
-#    netapi-test
-# Disable hplib,nwal-lld as hplib-mod is broken against K4.14
-#    hplib
-#    nwal-lld
-ARAGO_TI_PKGS_append_k2l = "\
-    dfe-lld \
-    iqn2-lld \
-    pa-lld \
-    "
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi
-#    netapi-test
-# Disable hplib,nwal-lld as hplib-mod is broken against K4.14
-#    hplib
-#    nwal-lld
-ARAGO_TI_PKGS_append_k2hk = "\
-    srio-lld \
-    mmap-lld \
-    hyplnk-lld \
-    aif2-lld \
-    pa-lld \
-    "
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi
-#    netapi-test
-# Disable hplib,nwal-lld as hplib-mod is broken against K4.14
-#    hplib
-#    nwal-lld
-ARAGO_TI_PKGS_append_k2e = "\
-    mmap-lld \
-    hyplnk-lld \
-    pa-lld \
-    "
-
-# vtun does not build against openssl 1.1
-ARAGO_VTUN = ""
-# vtun does not support aarch64
-ARAGO_VTUN_aarch64 = ""
-
-#    recovery-kernel
 RDEPENDS_${PN} = "\
     ${ARAGO_LIBNL} \
     ${ARAGO_NDISC6} \
-    ${ARAGO_TI_PKGS} \
-    ${ARAGO_VTUN} \
     ptpd \
     vsftpd \
     syslog-ng \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
index 22842108..5b8bea7f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
@@ -39,10 +39,6 @@ ARAGO_EXTRA = "\
     docker \
 "
 
-ARAGO_EXTRA_append_keystone = "\
-    k2-fw-initrd \
-"
-
 # minimal set of packages - needed to boot
 RDEPENDS_${PN} = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
index 0d6391d9..15323b0f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
@@ -23,11 +23,6 @@ GSTREAMER_DEPS_append_dra7xx = " \
     ${GSTREAMER_DSP} \
 "
 
-GSTREAMER_DEPS_append_keystone = " \
-    gstreamer1.0-plugins-hevc-dev \
-    ${GSTREAMER_DSP} \
-"
-
 RDEPENDS_${PN} = " \
     ${GSTREAMER_DEPS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
index 2679251f..e16b9878 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
@@ -26,11 +26,6 @@ GSTREAMER_DEPS_append_dra7xx = " \
     ${GSTREAMER_DSP} \
 "
 
-GSTREAMER_DEPS_append_keystone = " \
-    gstreamer1.0-plugins-hevc \
-    ${GSTREAMER_DSP} \
-"
-
 GSTREAMER_ACCEL_MM = ""
 GSTREAMER_ACCEL_MM_omap-a15 = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', "gstreamer1.0-plugins-ducati", '', d)}"
 GSTREAMER_ACCEL_MM_append_dra7xx = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', " gstreamer1.0-plugins-vpe", '', d)}"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index edc6a58c..366712e8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -32,10 +32,6 @@ UTILS_append_ti43x = " \
     pru-icss-source \
 "
 
-UTILS_append_k2g = " \
-    pru-icss-source \
-"
-
 UTILS_append_k3 = " \
     ti-sci-fw-source \
     trusted-firmware-a-source \
@@ -79,30 +75,6 @@ EXTRA_LIBS_append_ti43x = " \
     uio-module-drv-source \
 "
 
-# Disable ipsecmgr due to libnl and xfrm conflict
-#    ipsecmgr-mod-source
-# Disable hplib-mod-srv due to K4.14 breakage
-#    hplib-mod-source
-EXTRA_LIBS_append_keystone = " \
-    cmem-mod-source \
-    uio-module-drv-source \
-"
-
-#EXTRA_LIBS_append_k2hk = " \
-#    debugss-module-drv-source \
-#    gdbserverproxy-module-drv-source \
-#"
-
-#EXTRA_LIBS_append_k2l = " \
-#    debugss-module-drv-source \
-#    gdbserverproxy-module-drv-source \
-#"
-
-#EXTRA_LIBS_append_k2e = " \
-#    debugss-module-drv-source \
-#    gdbserverproxy-module-drv-source \
-#"
-
 PDM_ANOMALY_PKG_SRC = "\
     ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-src', '', d)} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 48a6cd5e..2e2801aa 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -13,136 +13,12 @@ UTILS = " \
 	python3-numpy \
 "
 
-UTILS_append_keystone = "\
-	kernel-dev \
-	libdnet-dev \
-	libdnet-staticdev \
-	binutils-dev \
-	binutils-staticdev \
-	elfutils-dev \
-	elfutils-staticdev \
-	bzip2-dev \
-	bzip2-staticdev \
-	boost-dev \
-	libsdl-dev \
-	"
-
-TI_SECURE_STORAGE_DEV = ""
-# All these secure storage packages need to be
-# migrated to openssl 1.1
-#	ti-softhsmv2-dev \
-#	libp11-dev \
-#	libp11-staticdev \
-#	"
-
-# Disable ipsecmgr due to libnl and xfrm conflict
-#	ipsecmgr-dev
-#	ipsecmgr-staticdev
-#	libnl-xfrm-dev
-#	libnl-xfrm-staticdev
-EXTRA_LIBS_append_keystone = "\
-	${TI_SECURE_STORAGE_DEV} \
-	cmem-dev \
-	cmem-staticdev \
-	udma-dev \
-	udma-staticdev \
-	traceframework-dev \
-	traceframework-staticdev \
-	cuia-dev \
-	cuia-staticdev \
-	common-csl-ip-dev \
-	cppi-lld-dev \
-	cppi-lld-staticdev \
-	qmss-lld-dev \
-	qmss-lld-staticdev \
-	rm-lld-dev \
-	rm-lld-staticdev \
-	pktlib-dev \
-	pktlib-staticdev \
-	libnl-dev \
-	libnl-staticdev \
-	multiprocmgr-dev \
-	multiprocmgr-staticdev \
-	mpm-transport-dev \
-	mpm-transport-staticdev \
-	edma3-lld-dev \
-	edma3-lld-staticdev \
-	lksctp-tools-dev \
-	lksctp-tools-staticdev \
-	ipc-transport-qmss-dev \
-	ipc-transport-qmss-staticdev \
-	"
-
-# Disable netapi due to libnl and xfrm conflict
-#	netapi-dev
-#	netapi-staticdev
-# Disable hplib-dev/staticdev,nwal-lld due to hplib-mod breakage against K4.14
-#	hplib-dev
-#	hplib-staticdev
-#	nwal-lld-dev
-#	nwal-lld-staticdev
-EXTRA_LIBS_append_k2l = "\
-	dfe-lld-dev \
-	dfe-lld-staticdev \
-	iqn2-lld-dev \
-	iqn2-lld-staticdev \
-	pa-lld-dev \
-	pa-lld-staticdev \
-	sa-lld-dev \
-	sa-lld-staticdev \
-	"
-
-# Disable netapi due to libnl and xfrm conflict
-#	netapi-dev
-#	netapi-staticdev
-# Disable hplib-dev/staticdev,nwal-lld due to hplib-mod breakage against K4.14
-#	hplib-dev
-#	hplib-staticdev
-#	nwal-lld-dev
-#	nwal-lld-staticdev
-EXTRA_LIBS_append_k2hk = "\
-	srio-lld-dev \
-	srio-lld-staticdev \
-	ipc-transport-srio-dev \
-	ipc-transport-srio-staticdev \
-	mmap-lld \
-	mmap-lld-staticdev \
-	hyplnk-lld-dev \
-	hyplnk-lld-staticdev \
-	aif2-lld-dev \
-	aif2-lld-staticdev \
-	pa-lld-dev \
-	pa-lld-staticdev \
-	sa-lld-dev \
-	sa-lld-staticdev \
-	"
-
-# Disable netapi due to libnl and xfrm conflict
-#	netapi-dev
-#	netapi-staticdev
-# Disable hplib-dev/staticdev,nwal-lld due to hplib-mod breakage against K4.14
-#	hplib-dev
-#	hplib-staticdev
-#	nwal-lld-dev
-#	nwal-lld-staticdev
-EXTRA_LIBS_append_k2e = "\
-	mmap-lld \
-	mmap-lld-staticdev \
-	hyplnk-lld-dev \
-	hyplnk-lld-staticdev \
-	pa-lld-dev \
-	pa-lld-staticdev \
-	sa-lld-dev \
-	sa-lld-staticdev \
-"
-
 UTILS_append_ti33x = " can-utils-dev"
 UTILS_append_ti43x = " can-utils-dev"
 UTILS_append_dra7xx = " can-utils-dev \
                         elfutils-dev \
                         elfutils-staticdev \
 "
-UTILS_append_k2g = " can-utils-dev"
 UTILS_append_k3 = "\
 	can-utils-dev \
 	ti-rpmsg-char-dev \
@@ -159,15 +35,6 @@ EXTRA_LIBS_append_dra7xx = " libulm-dev \
                              libulm-staticdev \
                              gdbserver-c6x-dev \
 "
-EXTRA_LIBS_append_k2hk = " libulm-staticdev \
-                               gdbserver-c6x-dev \
-"
-EXTRA_LIBS_append_k2l = " libulm-staticdev \
-                              gdbserver-c6x-dev \
-"
-EXTRA_LIBS_append_k2e = " libulm-staticdev \
-                              gdbserver-c6x-dev \
-"
 
 PDM_ANOMALY_PKG_DEV = "\
     ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-dev', '', d)} \
@@ -205,7 +72,6 @@ IPCDEV = " \
 "
 
 EXTRA_PACKAGES_append_omap-a15 = " ${IPCDEV}"
-EXTRA_PACKAGES_append_keystone = " ${IPCDEV}"
 EXTRA_PACKAGES_append_omapl138 = " ${IPCDEV}"
 
 RDEPENDS_${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 5fa9141d..4e88072a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -78,39 +78,12 @@ UTILS_append_dra7xx = " \
                         ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-example-apps','',d)} \
 "
 
-UTILS_append_keystone = " \
-    uio-module-drv-test \
-    ti-ipc-rtos-fw \
-"
-
-UTILS_append_k2hk = " \
-    ${UTILS_DSP} \
-"
-
-UTILS_append_k2l = " \
-    ${UTILS_DSP} \
-"
-
-UTILS_append_k2e = " \
-    ${UTILS_DSP} \
-"
-
-UTILS_append_k2g = " \
-    pru-icss \
-    uio-test-pruss \
-"
-
 EXTRA_LIBS = ""
 EXTRA_LIBS_append_omap-a15 = " \
     cmem \
     uio-module-drv \
 "
 
-EXTRA_LIBS_append_keystone = " \
-    cmem \
-    uio-module-drv \
-"
-
 EXTRA_LIBS_append_ti43x = " \
     cmem \
     uio-module-drv \
@@ -132,7 +105,6 @@ EXTRA_PACKAGES_omapl138 = " \
 "
 
 EXTRA_PACKAGES_append_omap-a15 = " ti-ipc-examples-linux"
-EXTRA_PACKAGES_append_keystone = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_omapl138 = " ti-ipc-examples-linux"
 
 EXTRA_PACKAGES_append_omap-a15 = " \
@@ -144,7 +116,6 @@ EXTRA_PACKAGES_append_am335x-evm = " pruss-lld-apps"
 EXTRA_PACKAGES_append_am437x-evm = " pruss-lld-apps"
 # acontis-atemsys
 EXTRA_PACKAGES_append_am57xx-evm = " pruss-lld-apps"
-EXTRA_PACKAGES_append_k2g-evm  = " pruss-lld-apps"
 
 RDEPENDS_${PN} = "\
     ${UTILS} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
index 954fb9d1..82d69403 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
@@ -15,9 +15,6 @@ KERNEL_SRC = "${PREFERRED_PROVIDER_virtual/kernel}-source"
 KERNEL_SHADOW_CLONE := "${PREFERRED_PROVIDER_virtual/kernel}"
 KERNEL_SHADOW_CLONE_ENABLED := "${SRCIPK_SHALLOW_CLONE_pn-${KERNEL_SHADOW_CLONE}}"
 
-BOOT_MONITOR = ""
-BOOT_MONITOR_keystone = "boot-monitor-source"
-
 EXTRA_FILES = ""
 EXTRA_FILES_ti43x = "tisdk-uenv"
 EXTRA_FILES_omap-a15 = "tisdk-readme tisdk-uenv"
@@ -29,7 +26,6 @@ RDEPENDS_${PN} = "\
     ti-tisdk-makefile \
     ${UBOOT_SRC} \
     ${KERNEL_SRC} \
-    ${BOOT_MONITOR} \
     ${@oe.utils.conditional('KERNEL_SHADOW_CLONE_ENABLED','true','unshallow-repositories','',d)} \
     tisdk-install \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
index 33c37cb0..2dca54e1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
@@ -8,14 +8,9 @@ inherit packagegroup
 
 CRYPTO_RDEPENDS = ""
 
-#CRYPTO_RDEPENDS_append_ti33x = " ti-crypto-examples-source"
-#CRYPTO_RDEPENDS_append_ti43x = " ti-crypto-examples-source"
-#CRYPTO_RDEPENDS_append_keystone = " ti-crypto-examples-source"
-
 CRYPTO_RDEPENDS_append_ti33x = " cryptodev-module-source"
 CRYPTO_RDEPENDS_append_ti43x = " cryptodev-module-source"
 CRYPTO_RDEPENDS_append_dra7xx = " cryptodev-module-source"
-CRYPTO_RDEPENDS_append_keystone = " cryptodev-module-source"
 CRYPTO_RDEPENDS_append_k3 = " cryptodev-module-source"
 
 RDEPENDS_${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
index 759276f9..7df60f9f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
@@ -10,7 +10,6 @@ CRYPTO_API = ""
 CRYPTO_API_ti33x = "cryptodev-module-dev"
 CRYPTO_API_ti43x = "cryptodev-module-dev"
 CRYPTO_API_dra7xx = "cryptodev-module-dev"
-CRYPTO_API_keystone = "cryptodev-module-dev"
 
 RDEPENDS_${PN} = "\
     openssl-dev \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
index 50b7e8ef..c2e6e68b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
@@ -17,7 +17,6 @@ CRYPTO_SUPPORT = "\
 CRYPTO_SUPPORT_append_ti33x = " cryptodev-module cryptodev-tests"
 CRYPTO_SUPPORT_append_ti43x = " cryptodev-module cryptodev-tests"
 CRYPTO_SUPPORT_append_dra7xx = " cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_keystone = " cryptodev-module cryptodev-tests"
 
 RDEPENDS_${PN} = "\
     ${CRYPTO_SUPPORT} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 4675cb80..7e2db8be 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -183,12 +183,6 @@ MATRIX_APPS_append_dra7xx += " \
     matrix-tidl-demo-dogbreeds \
 "
 
-MATRIX_APPS_append_keystone = " \
-    matrix-gui-utility-demos    \
-    matrix-mc-demo-ipc          \
-    matrix-multimedia-demo-dsp66imgproc-f2f \
-"
-
 RDEPENDS_${PN} = "        \
     ${MATRIX_ESSENTIALS}  \
     ${MATRIX_APPS}        \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index f923f305..b0de90cb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -36,8 +36,6 @@ MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
 #    ${@['','qt-opencv-opencl-opengl-multithreaded-source'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
 #"
 
-MULTIMEDIA_append_keystone = " ${BARCODE_PKG}"
-
 RDEPENDS_${PN} = "\
     ${MULTIMEDIA} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
index abc916f6..24a313bc 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
@@ -24,12 +24,6 @@ MULTIMEDIA_append_ti43x = " ${BARCODE_PKG}"
 MULTIMEDIA_append_omap-a15 = " ${BARCODE_PKG}"
 MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
 
-MULTIMEDIA_append_keystone = " \
-    hevc-arm-decoder-dev \
-    hevc-arm-decoder-staticdev \
-    ${BARCODE_PKG} \
-"
-
 RDEPENDS_${PN} = "\
     ${MULTIMEDIA} \
     packagegroup-arago-gst-sdk-target \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index b87966be..e1ae4d9e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -12,10 +12,6 @@ MULTIMEDIA = " \
 
 MULTIMEDIA_omapl138 = ""
 
-MULTIMEDIA_append_keystone = " \
-    hevc-arm-decoder \
-"
-
 DUAL_CAMERA_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo', '', d)}"
 IMAGE_GALLERY_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'image-gallery', '', d)}"
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
index b0aa15c3..1e6baa20 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
@@ -13,10 +13,6 @@ UTILS = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-examples-source')} \
 "
 
-UTILS_append_k2hk = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples-source')} \
-"
-
 UTILS_append_dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples-source')} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
index 550e5b9d..410bf47e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
@@ -13,10 +13,6 @@ UTILS = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-dev')} \
 "
 
-UTILS_append_k2hk = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-dev')} \
-"
-
 UTILS_append_dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-dev')} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
index 85ddcc0b..a36d794b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
@@ -17,11 +17,6 @@ MAIN_PKGS = " \
 EXTRA_PKGS = " \
 "
 
-#    ti-fftw-examples
-EXTRA_PKGS_append_k2hk = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
-"
-
 #    ti-fftw-examples
 EXTRA_PKGS_append_dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-recoveryfs.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-recoveryfs.bb
deleted file mode 100644
index 7ad32de7..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-recoveryfs.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Packagegroup for basic recovery rootfs"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-ARAGO_BASE = "\
-    module-init-tools \
-    mtd-utils \
-    initscript-telnetd \
-    "
-
-ARAGO_EXTRA = "\
-    makedumpfile \
-    crash-recovery \
-    "
-
-# minimal set of packages - needed to boot
-RDEPENDS_${PN} = "\
-    ${ARAGO_BASE} \
-    ${ARAGO_EXTRA} \
-    "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index 5244637e..4f8ebbc9 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -15,7 +15,6 @@ TISDK_TOOLCHAIN_EXTRA_TARGET = "\
     packagegroup-arago-tisdk-connectivity-sdk-target \
     packagegroup-arago-tisdk-crypto-sdk-target \
 "
-TISDK_TOOLCHAIN_EXTRA_TARGET_keystone = ""
 TISDK_TOOLCHAIN_EXTRA_TARGET_omapl138 = ""
 
 RDEPENDS_${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
index 09264c2a..05c88613 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
@@ -19,7 +19,6 @@ ANALYTICS = ""
 #    ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
 #    ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
-ANALYTICS_keystone = ""
 ANALYTICS_j7 = ""
 ANALYTICS_omapl138 = ""
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index 79f1081c..008b30ce 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -91,85 +91,6 @@ ARAGO_TI_TEST_append_omapl138 = " \
     ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti-ipc-test', d)} \
 "
 
-# Disable ipsecmgr due to libnl and xfrm conflict
-#    ipsecmgr
-ARAGO_TI_TEST_append_keystone = " \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', ' \
-        ti-ipc-test \
-        mpm-transport-test \
-        multiprocmgr-test \
-        qmss-lld-test \
-        cppi-lld-test \
-        edma3-lld-test \
-        rm-lld \
-        rm-lld-test \
-        traceframework-test \
-        udma-test \
-        cmem-test \
-    ', d)} \
-"
-
-# The following are not yet ready for k2g-evm
-#    nwal-lld-test
-#    hplib-test
-#    nwal-lld
-#    ipc-transport-qmss-test
-#    netapi-test
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi-test
-# Disable hplib-test,nwal-lld due to hplib-mod breakage against K4.14
-#    hplib-test
-#    nwal-lld-test
-#    nwal-lld
-ARAGO_TI_TEST_append_k2hk = " \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', ' \
-        srio-lld-test \
-        ipc-transport-srio-test \
-        ipc-transport-qmss-test \
-        hyplnk-lld-test \
-        mmap-lld-test \
-        aif2-lld-test \
-        pa-lld-test \
-        sa-lld \
-        sa-lld-test \
-    ', d)} \
-"
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi-test
-# Disable hplib-test,nwal-lld due to hplib-mod breakage against K4.14
-#    hplib-test
-#    nwal-lld-test
-#    nwal-lld
-ARAGO_TI_TEST_append_k2l = " \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', ' \
-        dfe-lld-test \
-        iqn2-lld-test \
-        ipc-transport-qmss-test \
-        pa-lld-test \
-        sa-lld \
-        sa-lld-test \
-    ', d)} \
-"
-
-# Disable netapi due to libnl and xfrm conflict
-#    netapi-test
-# Disable hplib-test,nwal-lld due to hplib-mod breakage against K4.14
-#    hplib-test
-#    nwal-lld-test
-#    nwal-lld
-ARAGO_TI_TEST_append_k2e = " \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', ' \
-        mmap-lld-test \
-        hyplnk-lld-test \
-        ipc-transport-qmss-test \
-        pa-lld-test \
-        sa-lld \
-        sa-lld-test \
-    ', d)} \
-"
-
 RDEPENDS_${PN} = "\
     ${ARAGO_TEST} \
     ${ARAGO_TI_TEST} \
diff --git a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
index 69a8cf7a..ac03ea43 100644
--- a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
+++ b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Script to parse ip address during boot and make it available to t
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://init;beginline=3;endline=31;md5=f82ddb19a87f97193d08feacfd0e4903"
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|keystone"
+COMPATIBLE_MACHINE = "ti33x|ti43x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "file://init"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
deleted file mode 100644
index 557a4393..00000000
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ipsecmgr-mod
+++ /dev/null
@@ -1,28 +0,0 @@
-ipsecmgr-mod: linux
-	@echo ================================
-	@echo      Building ipsecmgr-mod
-	@echo ================================
-	@cd board-support/extra-drivers; \
-	cd `find . -maxdepth 1 -type d -name "ipsecmgr-mod*"`; \
-	make ARCH=__KERNEL_ARCH__ KDIR=$(LINUXKERNEL_INSTALL_DIR)
-
-ipsecmgr-mod_clean:
-	@echo ================================
-	@echo      Cleaning ipsecmgr-mod
-	@echo ================================
-	@cd board-support/extra-drivers; \
-	cd `find . -maxdepth 1 -type d -name "ipsecmgr-mod*"`; \
-	make ARCH=__KERNEL_ARCH__ KDIR=$(LINUXKERNEL_INSTALL_DIR) clean
-
-ipsecmgr-mod_install:
-	@echo ================================
-	@echo      Installing ipsecmgr-mod
-	@echo ================================
-	@if [ ! -d $(DESTDIR) ] ; then \
-		echo "The extracted target filesystem directory doesn't exist."; \
-		echo "Please run setup.sh in the SDK's root directory and then try again."; \
-		exit 1; \
-	fi
-	@cd board-support/extra-drivers; \
-	cd `find . -maxdepth 1 -type d -name "ipsecmgr-mod*"`; \
-	make ARCH=__KERNEL_ARCH__  KDIR=$(LINUXKERNEL_INSTALL_DIR)  INSTALL_MOD_PATH=$(DESTDIR) PREFIX=$(SDK_PATH_TARGET) INSTALL_MOD_STRIP=$(INSTALL_MOD_STRIP) install
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_pru-icss b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_pru-icss
index 10e5bf3f..f1e6c433 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_pru-icss
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_pru-icss
@@ -74,19 +74,6 @@ pru-icss_install_am572x: pru-icss_install_common
 		done; \
 	done
 
-pru-icss_install_k2g: pru-icss_install_common
-	@cd example-applications; cd `find . -maxdepth 1 -type d -name "*pru-icss*"`; \
-	install -m 0644 ./examples/k2g/PRU_Halt/gen/PRU_Halt.out \
-		$(DESTDIR)/lib/firmware/pru; \
-	for i in 0 1; \
-	do \
-		for j in 0 1; \
-		do \
-			install -m 0644 ./examples/k2g/PRU_RPMsg_Echo_Interrupt$${i}_$${j}/gen/PRU_RPMsg_Echo_Interrupt$${i}_$${j}.out \
-				$(DESTDIR)/lib/firmware/pru; \
-		done; \
-	done
-
 pru-icss_install_am65x: pru-icss_install_common
 	@cd example-applications; cd `find . -maxdepth 1 -type d -name "*pru-icss*"`; \
 	for i in 0 1; \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 30e51386..6937ced1 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -42,7 +42,6 @@ SRC_URI = "\
     file://Makefile_uio-module-drv \
     file://Makefile_pru-icss \
     file://Makefile_qt-opencv-opencl-opengl-multithreaded \
-    file://Makefile_ipsecmgr-mod \
     file://Makefile_openmpacc-examples \
     file://Makefile_linalg-examples \
     file://Makefile_ti-gc320-driver \
@@ -62,7 +61,6 @@ MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         qt-tstat \
 "
 
-MAKEFILES_MATRIX_GUI_keystone = ""
 MAKEFILES_MATRIX_GUI_omapl138 = ""
 MAKEFILES_MATRIX_GUI_j7 = ""
 
@@ -77,14 +75,6 @@ MAKEFILES = ""
 
 # Add device specific make targets
 
-MAKEFILES_append_omap3 = " u-boot-spl \
-"
-MAKEFILES_append_am37x-evm = " av-examples \
-                               ti-ocf-crypto-module \
-"
-MAKEFILES_append_am3517-evm = " av-examples \
-                                ti-ocf-crypto-module \
-"
 MAKEFILES_append_ti33x = " u-boot-spl \
                            ti-crypto-examples \
                            linux-dtbs \
@@ -137,40 +127,6 @@ MAKEFILES_append_omapl138 = " linux-dtbs \
                               ti-ipc \
 "
 
-MAKEFILES_append_keystone = " u-boot-spl \
-                              linux-dtbs \
-                              boot-monitor \
-                              cmem-mod \
-                              cryptodev \
-                              ti-crypto-examples \
-                              hplib-mod \
-                              uio-module-drv \
-                              ipsecmgr-mod \
-                              barcode-roi \
-                              ti-ipc \
-"
-
-#                              gdbserverproxy-module-drv 
-#                              debugss-module-drv 
-MAKEFILES_append_k2hk = " opencl-examples \
-                              openmpacc-examples \
-                              linalg-examples \
-"
-
-#                             gdbserverproxy-module-drv 
-#                             debugss-module-drv 
-MAKEFILES_append_k2l = " opencl-examples \
-                             openmpacc-examples \
-"
-
-#                             gdbserverproxy-module-drv 
-#                             debugss-module-drv 
-MAKEFILES_append_k2e = " opencl-examples \
-                             openmpacc-examples \
-"
-
-MAKEFILES_append_k2g = " pru-icss"
-
 MAKEFILES_append_k3 = " u-boot-spl \
                         linux-dtbs \
                         cryptodev \
@@ -216,17 +172,14 @@ TI_SGX_TARGET_ARCH_k3 = "aarch64"
 
 PLATFORM_DEBUGSS = ""
 PLATFORM_DEBUGSS_dra7xx = "DRA7xx_PLATFORM"
-PLATFORM_DEBUGSS_keystone = "KEYSTONE_PLATFORM"
 
 PLATFORM_GDBSERVERPROXY = ""
 PLATFORM_GDBSERVERPROXY_dra7xx = "DRA7xx_PLATFORM"
-PLATFORM_GDBSERVERPROXY_keystone = "KEYSTONE_PLATFORM"
 
 PRU_ICSS_INSTALL_TARGET = "pru-icss_install_none"
 PRU_ICSS_INSTALL_TARGET_ti33x = "pru-icss_install_am335x"
 PRU_ICSS_INSTALL_TARGET_ti43x = "pru-icss_install_am437x"
 PRU_ICSS_INSTALL_TARGET_omap-a15 = "pru-icss_install_am572x"
-PRU_ICSS_INSTALL_TARGET_k2g = "pru-icss_install_k2g"
 PRU_ICSS_INSTALL_TARGET_am65xx = "pru-icss_install_am65x"
 PRU_ICSS_INSTALL_TARGET_j7 = "pru-icss_install_j721e"
 PRU_ICSS_INSTALL_TARGET_am64xx = "pru-icss_install_am64x"
@@ -241,7 +194,6 @@ IPC_TOOLS_PATHS_R5F  = "ti.targets.arm.elf.R5F="\$\(TOOLCHAIN_PATH_R5\)""
 IPC_TOOLS_PATHS_C674 = "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
 
 IPC_TOOLS_PATHS = ""
-IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
 IPC_TOOLS_PATHS_append_omap-a15 = " ${IPC_TOOLS_PATHS_C66} ${IPC_TOOLS_PATHS_M4}"
 IPC_TOOLS_PATHS_append_omapl138 = " ${IPC_TOOLS_PATHS_C674}"
 IPC_TOOLS_PATHS_append_k3 = "${IPC_TOOLS_PATHS_R5F}"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
index d6f3dc28..5f7d9f15 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
@@ -13,8 +13,6 @@ S = "${WORKDIR}/git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SDCARD_SCRIPT = " create-sdcard.sh"
-SDCARD_SCRIPT_keystone = ""
-SDCARD_SCRIPT_k2g = " create-sdcard.sh"
 
 SETUP_SCRIPTS = " common.sh \
                   setup-host-check.sh \
@@ -27,17 +25,12 @@ SETUP_SCRIPTS = " common.sh \
                   ${SDCARD_SCRIPT} \
 "
 
-UBOOT_ENV_am37x-evm = "setup-uboot-env-am37x.sh"
-UBOOT_ENV_beagleboard = "setup-uboot-env-beagleboard.sh"
-UBOOT_ENV_am3517-evm = "setup-uboot-env-am3517.sh"
 UBOOT_ENV_omapl138 = "setup-uboot-env-am18x.sh"
 UBOOT_ENV_ti33x = "setup-uboot-env-am335x.sh"
 UBOOT_ENV_ti43x = "setup-uboot-env-am43x.sh"
 UBOOT_ENV_omap5-evm = "setup-uboot-env-omap5.sh"
 UBOOT_ENV_am57xx-evm = "setup-uboot-env-am57xx-evm.sh"
 UBOOT_ENV_k3 = "setup-uboot-env-am65x.sh"
-UBOOT_ENV_keystone = "setup-uboot-env-keystone.sh"
-UBOOT_ENV_k2g = "setup-uboot-env-k2g-evm.sh"
 UBOOT_ENV = "setup-uboot-unknown.sh"
 
 do_install () {
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index d64a80f8..5f105422 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -39,6 +39,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 "
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
-    ipsecmgr-mod \
     gstreamer1.0-plugins-bad \
 "
diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
index 50d721b3..92b39914 100644
--- a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
+++ b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://makefile;beginline=1;endline=31;md5=2f2ea348b98d5cc7807ece7adcc2c43a"
 
-COMPATIBLE_MACHINE = "omap-a15|keystone"
+COMPATIBLE_MACHINE = "omap-a15"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 BIG_DATA_IPC_GIT_URI = "git://git.ti.com/processor-sdk/big-data-ipc-examples.git"
@@ -21,10 +21,6 @@ S = "${WORKDIR}/git"
 
 PLATFORM = "UNKNOWN"
 PLATFORM_omap-a15 = "DRA7XX"
-PLATFORM_k2hk-evm = "TCI6636"
-PLATFORM_k2l = "TCI6630"
-PLATFORM_k2e = "66AK2E"
-PLATFORM_k2g = "66AK2G"
 
 IPC_TARGETS = ""
 IPC_TARGETS_omap-a15 = "\
@@ -32,8 +28,3 @@ IPC_TARGETS_omap-a15 = "\
     ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
     ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \
 "
-
-IPC_TARGETS_keystone = " \
-    gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
-    ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
-"
diff --git a/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo.inc b/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo.inc
deleted file mode 100644
index 77b61ac8..00000000
--- a/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "This recipe creates a posix-smp-demo binaries."
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://dhry.h;beginline=1;endline=377;md5=8f2fbe6e071d9ea4afeca73cfd656ec8"
-
-POSIX_SMP_GIT_URI = "git://git.ti.com/keystone-demos/posix-smp.git"
-POSIX_SMP_GIT_PROTOCOL = "git"
-POSIX_SMP_GIT_BRANCH = "master"
-
-# Below commit ID corresponds to "DEV.POSIX-SMP.01.01.00.02B"
-POSIX_SMP_SRCREV = "339039e281586a79c5b04fac6c2ae84eb30c0576"
-
-BRANCH = "${POSIX_SMP_GIT_BRANCH}"
-SRC_URI = "${POSIX_SMP_GIT_URI};protocol=${POSIX_SMP_GIT_PROTOCOL};branch=${BRANCH}"
-
-SRCREV = "${POSIX_SMP_SRCREV}"
-PV = "01.01.00.02B"
-INC_PR = "r0"
-
-S = "${WORKDIR}/git"
diff --git a/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo_git.bb b/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo_git.bb
deleted file mode 100644
index 7cd201cf..00000000
--- a/meta-arago-extras/recipes-apps/posix-smp-demo/posix-smp-demo_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require posix-smp-demo.inc
-
-PR = "${INC_PR}.0"
-
-EXTRA_OEMAKE = "-f Makefile_linux EGCC="${CC}""
-
-do_compile() {
-    oe_runmake posix-smp-demo-linux-armv7
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 posix-smp-demo-linux-armv7 ${D}${bindir}
-}
-
-INSANE_SKIP_${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
index 3f4cf803..9bc32cdf 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
@@ -52,7 +52,7 @@ do_install_prepend() {
 }
 
 3D_DEMOS_RDEPENDS_MATRIX = "matrix-gui-apps-images matrix-gui-submenus-3d"
-3D_DEMOS_RDEPENDS = "${3D_DEMOS_RDEPENDS_MATRIX} libgles-omap3-rawdemos"
+3D_DEMOS_RDEPENDS = "${3D_DEMOS_RDEPENDS_MATRIX}"
 3D_DEMOS_RDEPENDS_omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
 3D_DEMOS_RDEPENDS_ti43x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
 3D_DEMOS_RDEPENDS_ti33x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
index bdb446da..36598517 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
@@ -12,6 +12,6 @@ S = "${WORKDIR}/git/arm_apps"
 RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-arm"
 
 # Make sure the benchmarks have been installed
-RDEPENDS_${PN} += "arm-benchmarks lmbench nbench-byte matrix-gui-helper-scripts posix-smp-demo"
+RDEPENDS_${PN} += "arm-benchmarks lmbench nbench-byte matrix-gui-helper-scripts"
 
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
index 7029df53..9fd48820 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
@@ -10,14 +10,8 @@ S = "${WORKDIR}/git/cryptos_apps_scripts"
 S_ti33x = "${WORKDIR}/git/cryptos_apps_program"
 S_ti43x = "${WORKDIR}/git/cryptos_apps_program"
 S_dra7xx = "${WORKDIR}/git/cryptos_apps_program"
-S_keystone = "${WORKDIR}/git/cryptos_apps_program"
 
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"
 
 # Make sure crypto submenu and app images has been installed. Also make sure openssl is available
 RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl matrix-gui-helper-scripts"
-
-#RDEPENDS_${PN}_append_ti33x = " ti-crypto-examples"
-#RDEPENDS_${PN}_append_ti43x = " ti-crypto-examples"
-#RDEPENDS_${PN}_append_dra7xx = " ti-crypto-examples"
-#RDEPENDS_${PN}_append_keystone = " ti-crypto-examples"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
index 83e10bac..8cb6cf29 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
@@ -11,7 +11,6 @@ S = "${WORKDIR}/git/utilities_apps"
 do_install_prepend(){
    install -d ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_eeprom/eeprom ${D}${MATRIX_BASE_DIR}/html-apps/
-   cp -rf ${S}/utility_flash/flash ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_filesystem/filesystem ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_info/info ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_stats/stats ${D}${MATRIX_BASE_DIR}/html-apps/
@@ -19,7 +18,6 @@ do_install_prepend(){
 
 do_install_append(){
     rm ${D}${MATRIX_APP_DIR}/utility_eeprom/eeprom-utility.php
-    rm ${D}${MATRIX_APP_DIR}/utility_flash/flash-utility.php
     rm ${D}${MATRIX_APP_DIR}/utility_filesystem/filesystem-utility.php
     rm ${D}${MATRIX_APP_DIR}/utility_info/info-utility.php
     rm ${D}${MATRIX_APP_DIR}/utility_stats/stats-utility.php
diff --git a/meta-arago-extras/recipes-devtools/flash-utility/flash-utility-1.6.0.0/LICENSE b/meta-arago-extras/recipes-devtools/flash-utility/flash-utility-1.6.0.0/LICENSE
deleted file mode 100644
index fd4f082f..00000000
--- a/meta-arago-extras/recipes-devtools/flash-utility/flash-utility-1.6.0.0/LICENSE
+++ /dev/null
@@ -1,63 +0,0 @@
-Copyright (c) 2010, Texas Instruments Incorporated
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- - Neither the name of Texas Instruments nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-Copyright (C) 2008 The Android Open Source Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly
-
-Permission is granted to copy and distribute this document for any
-purpose and without charge, including translations into other
-languages and incorporation into compilations, provided that the
-copyright notice and this notice are preserved, and that any
-substantive changes or deletions from the original are clearly
-marked.
diff --git a/meta-arago-extras/recipes-devtools/flash-utility/flash-utility_1.6.0.0.bb b/meta-arago-extras/recipes-devtools/flash-utility/flash-utility_1.6.0.0.bb
deleted file mode 100644
index 48fb1f42..00000000
--- a/meta-arago-extras/recipes-devtools/flash-utility/flash-utility_1.6.0.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Texas Instruments Flash Utility"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a428c464689fd2fac5b185963cbfbf85"
-
-PR = "r0"
-
-COMPATIBLE_MACHINE = "am37x-evm|am3517-evm"
-
-SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/580/4785/Flash_v1.6.0.0.zip;name=base;subdir=${P}"
-
-# Temporarily add LICENSE file here since zip files don't contain any license information. This file was grabbed
-# from the License Agreement screen when installing the flash utility application.
-SRC_URI += "file://LICENSE"
-
-S = "${WORKDIR}/${P}"
-
-do_unpack_extra() {
-    mv ${WORKDIR}/LICENSE ${WORKDIR}/${P}
-}
-
-addtask unpack_extra after do_unpack before do_patch
-
-installdir = "host-tools/flash_utils/windows"
-
-do_install() {
-    install -d ${D}/${installdir}
-    install ${S}/setup.exe ${D}/${installdir}
-    install ${S}/FlashInstaller.msi ${D}/${installdir}
-    install ${S}/Release_Notes.txt ${D}/${installdir}
-}
-
-FILES_${PN} += "${installdir}/*"
-
-SRC_URI[base.md5sum] = "1f53efa31996afb5af78930739090ae6"
-SRC_URI[base.sha256sum] = "f6722422016ec4e49b8c55c38affea4c924b6636a47d0d67e6537e7dab108a1b"
diff --git a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
index 51c65716..9d770751 100644
--- a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
+++ b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Texas Instruments Pinmux Utility"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d69a4aafe4f7b66d5f9c60d6875ebd52"
-COMPATIBLE_MACHINE = "am335x-evm|am37x-evm|am3517-evm|beagleboard"
+COMPATIBLE_MACHINE = "am335x-evm"
 
 PR = "r0"
 
diff --git a/meta-arago-extras/recipes-kernel/recovery-kernel/recovery-kernel_1.0.bb b/meta-arago-extras/recipes-kernel/recovery-kernel/recovery-kernel_1.0.bb
deleted file mode 100644
index 3fc631b5..00000000
--- a/meta-arago-extras/recipes-kernel/recovery-kernel/recovery-kernel_1.0.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "Recovery kernel building for Keystone EVM"
-LICENSE = "GPLv2"
-
-# recovery kernel needs devtree compiler to add padding bytes
-DEPENDS += "dtc-native"
-
-PR = "r4"
-COMPATIBLE_MACHINE = "keystone"
-BRANCH = "v3.10.72/master"
-SRCREV = "b9bad8fccc5f9c6bcd78363982b3249a15f193fb"
-SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}"
-S = "${WORKDIR}/git"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-FILES_${PN} += "${bindir}/crashdump"
-LINUX_ZIMAGE = "zImage"
-KERNEL_MACHINE ?= "keystone2_recovery_defconfig"
-KERNEL_DTBTYPE = "k2hk-evm-recovery.dtb k2l-evm-recovery.dtb k2e-evm-recovery.dtb "
-CRASHDIR = "crashdump"
-ARCH = "${TARGET_ARCH}"
-CROSS_COMPILE = "${TARGET_PREFIX}"
-
-export ARCH
-export CROSS_COMPILE
-
-do_configure () {
-	make ${KERNEL_MACHINE}
-}
-
-do_compile() {
-	make ${LINUX_ZIMAGE} KALLSYMS_EXTRA_PASS=1
-	make ${KERNEL_DTBTYPE}
-        for d in ${KERNEL_DTBTYPE}
-        do
-            dtc -I dtb -O dtb -p 2048 -o $d arch/arm/boot/dts/$d
-        done
-}
-
-do_install () {
-	install -d ${D}${bindir}/${CRASHDIR}/
-	install ${S}/arch/arm/boot/${LINUX_ZIMAGE} ${D}${bindir}/${CRASHDIR}
-        for d in ${KERNEL_DTBTYPE}
-        do
-            install ${S}/$d ${D}${bindir}/${CRASHDIR}
-        done
-}
diff --git a/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb b/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
index 2f570d43..c1caa980 100644
--- a/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
+++ b/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
@@ -9,9 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 VIDEO_FILES = "video_480p "
 
-VIDEO_FILES_append_am37x-evm   = "video_vga_r"
-VIDEO_FILES_append_beagleboard = "video_vga"
-VIDEO_FILES_append_am3517-evm  = "video_wqvga"
 VIDEO_FILES_append_ti33x       = "video_wvga \
                                   video_wqvga"
 VIDEO_FILES_append_ti43x       = "video_wqvga"
@@ -21,8 +18,6 @@ VIDEO_FILES_append_dra7xx      = "video_wvga \
                                   video_yuv"
 VIDEO_FILES_append_k3          = "video_720p"
 
-VIDEO_FILES_keystone = "video_720p "
-
 BRANCH = "master"
 
 SRC_URI = "git://git.ti.com/processor-sdk/amsdk-av-files.git;protocol=git;branch=${BRANCH}"
@@ -45,4 +40,3 @@ do_install() {
 }
 
 FILES_${PN} += "${datadir}/ti/*"
-
diff --git a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb b/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
deleted file mode 100644
index 65ff4f3b..00000000
--- a/meta-arago-extras/recipes-multimedia/av-examples/av-examples_1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Linux Audio Video Example Applications"
-HOMEPAGE = "https://gforge.ti.com/gf/project/av_examples/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM := "file://COPYING;md5=80ea1ff5788f65d5c5b3206d50d4bc6c"
-SECTION = "system"
-
-PR = "r2"
-
-DEPENDS = "virtual/kernel"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "(omap3)"
-
-BRANCH ?= "master"
-SRCREV = "b67b11011a8a54a7598eed383f3a106c32b47c6d"
-
-SRC_URI = "git://git.ti.com/apps/av_examples.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-# TODO: Export LDFLAGS from Rules.make to eliminate use of INSANE_SKIP which would otherwise lead to discrepancies between host and arago binaries
-INSANE_SKIP_${PN} = "True"
-
-do_compile() {
-
-	touch debug
-	export CROSS_COMPILE=${TARGET_PREFIX}
-	export CFLAGS='${TARGET_CC_ARCH}'
-	make release LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" PLATFORM="${MACHINE}"
-}
-
-do_install() {
-	make DESTDIR=${D} install
-}
diff --git a/meta-arago-extras/recipes-multimedia/demo-image-proc/demo-image-proc_git.bb b/meta-arago-extras/recipes-multimedia/demo-image-proc/demo-image-proc_git.bb
deleted file mode 100644
index 29d87eaf..00000000
--- a/meta-arago-extras/recipes-multimedia/demo-image-proc/demo-image-proc_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "TI Image Processing Demo for KeyStone 2"
-HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-demos/image-proc.git"
-LICENSE = "BSD & MIT"
-LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=29;md5=ada2acff673fad7c53cbfd2598525f2a"
-SECTION = "console"
-COMPATIBLE_MACHINE = "keystone"
-
-DEPENDS = "ti-ipc"
-
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-demos/image-proc.git;protocol=git;branch=${BRANCH}"
-#Commit corresponds to DEV.DEMO_IMAGE_PROC-01.00.00.03
-SRCREV = "d1f4014d28ecedf34dbd20f04d4277eb1c4b8ae0"
-PV = "1.0.0.3"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} = "${bindir}/image_processing_master"
-
-do_install() {
-	if [ ! -d ${D}/${bindir} ]
-	then
-		install -d ${D}${bindir}
-	fi
-	install -c -m 755 ${S}/ipc/master/image_processing_master.out ${D}${bindir}/image_processing_master
-}
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
index 617fdc95..4f7f73e5 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
@@ -11,7 +11,7 @@ SRCREV = "0abedafadbed693592804f23482a9447d81b2dbf"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base opencl ti-cgt6x-native clocl-native imglib-c66x vlib-c66x gettext-native"
 
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
index 83ef1030..78dd4d3c 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://git.ti.com/processor-sdk/gst-plugin-hevc"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2827f94fc0a1adeff4d9702e97ce2979"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 
 SRC_URI = "git://git.ti.com/processor-sdk/gst-plugin-hevc.git;protocol=git \
 	file://0001-configure.ac-stop-using-export-symbols-regex.patch"
diff --git a/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb b/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
index 069e8397..9a262311 100644
--- a/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
+++ b/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
@@ -4,7 +4,7 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://Inc/exp_pp_h265decoder.h;beginline=1;endline=27;md5=51a0ae5cca603a21186bf6ff458f3be9"
 PR = "r4"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 
 BRANCH = "master"
 
diff --git a/meta-arago-extras/recipes-support/crash-recovery/crash-recovery.bb b/meta-arago-extras/recipes-support/crash-recovery/crash-recovery.bb
deleted file mode 100644
index 95959093..00000000
--- a/meta-arago-extras/recipes-support/crash-recovery/crash-recovery.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Initscripts for kdump recovery mechanism"
-LICENSE = "BSD-3-Clause"
-
-COMPATIBLE_MACHINE = "keystone"
-LIC_FILES_CHKSUM = "file://recoveryfs.sh;beginline=1;endline=20;md5=83e9f5412fd9a0db2aee516b52c24535"
-PR ="r1"
-
-S = "${WORKDIR}"
-SRC_URI = "file://recoveryfs.sh"
-
-INITSCRIPT_NAME = "recoveryfs.sh"
-INITSCRIPT_PARAMS = "defaults 10"
-
-inherit update-rc.d
-
-do_install_append() {
-        install -d ${D}${sysconfdir}/init.d/
-        install -c -m 755 ${WORKDIR}/recoveryfs.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-}
diff --git a/meta-arago-extras/recipes-support/crash-recovery/files/recoveryfs.sh b/meta-arago-extras/recipes-support/crash-recovery/files/recoveryfs.sh
deleted file mode 100755
index d1b15e42..00000000
--- a/meta-arago-extras/recipes-support/crash-recovery/files/recoveryfs.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#*
-#* Copyright (C) 2012-2014 Texas Instruments Incorporated - http://www.ti.com/
-#*
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*    Redistributions of source code must retain the above copyright
-#*    notice, this list of conditions and the following disclaimer.
-#*
-#*    Redistributions in binary form must reproduce the above copyright
-#*    notice, this list of conditions and the following disclaimer in the
-#*    documentation and/or other materials provided with the
-#*    distribution.
-#*
-#*    Neither the name of Texas Instruments Incorporated nor the names of
-#*    its contributors may be used to endorse or promote products derived
-#*    from this software without specific prior written permission.
-#*
-
-#!/bin/sh
-
-if [ -f /proc/vmcore ] ; then
-  mkdir -p /mnt/boot2
-  mount -o rw,sync -t ubifs /dev/ubi0_2 /mnt/boot2
-  if [ $? -eq 0 ] ; then
-     if [ -f /usr/bin/makedumpfile ] ; then
-       makedumpfile -E -d 31 /proc/vmcore /mnt/boot2/home/root/coredump.elf
-       gzip -c /mnt/boot2/home/root/coredump.elf > /mnt/boot2/home/root/coredump.elf.gz
-       rm -rf /mnt/boot2/home/root/coredump.elf
-       sync
-       reboot
-     else
-       echo "makedumpfile not found"
-       exit 1
-     fi
-  else
-    echo "mount unsuccessful"
-    exit 1
-  fi
-fi
-
-exit 0
diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
deleted file mode 100644
index 34d56f55..00000000
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr-mod_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "IPSec Manager kernel module"
-DESCRIPTION = "Provides Module to offload IPSec security policy & associated security association to NETCP for crypto operations"
-
-LIC_FILES_CHKSUM = "file://../../ipsecmgr_snoop.h;beginline=1;endline=33;md5=f7eadca4fb5599f508dc11fa1e752919"
-
-include ipsecmgr.inc
-
-MACHINE_KERNEL_PR_append = "d"
-PR = "${MACHINE_KERNEL_PR}"
-
-EXTRA_OEMAKE += "KDIR="${STAGING_KERNEL_DIR}""
-
-inherit module
-
-S = "${WORKDIR}/git/src/module"
-
-do_install() {
-# Install kernel module
-	oe_runmake INSTALL_MOD_PATH="${D}" install
-}
-
-KERNEL_MODULE_AUTOLOAD += "ipsecmgr_mod"
diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
deleted file mode 100644
index 331f19c2..00000000
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-LICENSE = "BSD-3-Clause"
-BRANCH="master"
-SRC_URI = "git://arago-project.org/git/projects/ipsecmgr.git;protocol=git;branch=${BRANCH}"
-
-SRCREV = "d3ebaa8c80346c8037b5e81c636ab26785ccefaf"
-PV     = "01.01.00.04+git${SRCPV}"
diff --git a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb b/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
deleted file mode 100644
index 605e48ff..00000000
--- a/meta-arago-extras/recipes-support/ipsecmgr/ipsecmgr_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "IPSec Manager libraries"
-DESCRIPTION = "Provides library to offload IPSec security policy & associated security association to NETCP for crypto operations"
-
-LIC_FILES_CHKSUM = "file://../ipsecmgr_snoop.h;beginline=1;endline=33;md5=f7eadca4fb5599f508dc11fa1e752919"
-
-include ipsecmgr.inc
-
-PR = "r3"
-
-DEPENDS = "libnl-xfrm"
-RDEPENDS_${PN} = "ipsecmgr-mod"
-
-CFLAGS += "-I${STAGING_INCDIR}/libnl3"
-
-S = "${WORKDIR}/git/build"
-LIB_INC_DIR = "${WORKDIR}/git"
-UTILS_LIB_INC_DIR = "${WORKDIR}/git/utils/iface/"
-
-ALLOW_EMPTY_${PN} = "1"
-
-do_compile() {
-# Compile the library
-	make clean
-	make all
-}
-do_install() {
-# Install libraries
-	install -d ${D}${libdir}/
-	install -c -m 666 libipsecmgr_snoop.a ${D}${libdir}/
-	install -c -m 666 libipsecmgr_ipc.a ${D}${libdir}/
-	install -c -m 666 libipsecmgr_syslog.a ${D}${libdir}/
-	install -d ${D}${includedir}/
-	install -c -m 666 ${LIB_INC_DIR}/*.h ${D}${includedir}/
-	install -c -m 666 ${UTILS_LIB_INC_DIR}/*.h ${D}${includedir}/
-}
diff --git a/meta-arago-extras/recipes-support/libnl-xfrm/libnl-xfrm_git.bb b/meta-arago-extras/recipes-support/libnl-xfrm/libnl-xfrm_git.bb
deleted file mode 100644
index 526ad0ab..00000000
--- a/meta-arago-extras/recipes-support/libnl-xfrm/libnl-xfrm_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Libnl extension for XFRM support"
-PROVIDES = "libnl-xfrm"
-SECTION = "net"
-LICENSE = "BSD-3-Clause"
-
-COMPATIBLE_MACHINE = "keystone"
-
-LIC_FILES_CHKSUM = "file://include/xfrm_pvt.h;beginline=1;endline=33;md5=fe068af290f274f2a86a867bbd7cc61c"
-
-DEPENDS = "libnl"
-
-BRANCH="hawking_dev"
-# The following commit correspond to DEV.LIBNL-XFRM.03.01.00.00A
-SRCREV = "2a5ee7c4f41398c07c593e81af7b71c7720e6de8"
-SRC_URI = "git://arago-project.org/git/projects/libnl-xfrm.git;protocol=git;branch=${BRANCH}"
-
-PR = "r1"
-
-S = "${WORKDIR}/git"
-
-LIBNL_XFRM_LIB = "lib/libnl-xfrm.a"
-
-CFLAGS += "-I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3 -fPIC -DPIC "
-
-do_compile() {
-	mkdir -p ${S}/lib
-	make clean
-	make all
-}
-
-do_install_append() {
-	install -d ${D}${libdir}/
-	install -d ${D}${includedir}/
-	install -d ${D}${includedir}/libnl3/netlink/
-	install -d ${D}${includedir}/libnl3/netlink/xfrm/
-	install -c -m 755 ${S}/${LIBNL_XFRM_LIB} ${D}${libdir}/
-	install -c -m 755 ${S}/include/netlink/xfrm/*.h ${D}${includedir}/libnl3/netlink/xfrm/
-	install -c -m 755 ${S}/lib/libnl-xfrm.so ${D}${libdir}/libnl-xfrm.so.1.0.0
-	cd ${D}${includedir}/
-	ln -s libnl3/netlink netlink
-	cd ${D}${libdir}/
-	ln -s libnl-xfrm.so.1.0.0 libnl-xfrm.so.1
-	ln -s libnl-xfrm.so.1.0.0 libnl-xfrm.so
-}
diff --git a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb b/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
index 2631e72e..e0d758d3 100644
--- a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
+++ b/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
@@ -15,10 +15,9 @@ PR = "${INC_PR}.0"
 
 DEPENDS = "common-csl-ip-rtos libarch ti-xdctools-native doxygen-native ti-cgt6x-native ti-xdais libulm dsplib-c66x php libxslt-native libxslt openmp-rtos"
 
-COMPATIBLE_MACHINE = "k2hk|dra7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 
 TARGET_dra7xx = "SOC_AM572x"
-TARGET_k2hk   = "SOC_K2H"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb b/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
index 84b6ba14..5cb4e5df 100644
--- a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
+++ b/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
@@ -18,9 +18,8 @@ DEPENDS = "common-csl-ip-rtos common-csl-ip ti-xdctools-native ti-sysbios ti-cgt
 
 RDEPENDS_${PN} += "opencl-runtime"
 
-COMPATIBLE_MACHINE = "k2hk|dra7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 TARGET_dra7xx = "SOC_AM572x"
-TARGET_k2hk   = "SOC_K2H"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/ti/fftw"
diff --git a/meta-arago-extras/recipes-ti/libarch/libarch.inc b/meta-arago-extras/recipes-ti/libarch/libarch.inc
index b7a7af6c..ee3bc747 100644
--- a/meta-arago-extras/recipes-ti/libarch/libarch.inc
+++ b/meta-arago-extras/recipes-ti/libarch/libarch.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://src/ti/libarch/docs/LibArch_1.0.0_manifest.html;md5=b
 SRC_URI = "git://git.ti.com/library-architecture/libarch.git;protocol=git;branch=${BRANCH}"
 SRCREV = "cb6d785e95cd390c6388853a4f1e99a302e5a58f"
 
-COMPATIBLE_MACHINE = "k2hk|dra7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
@@ -34,4 +34,3 @@ export FC_DIR = "${FC_INSTALL_DIR}"
 export PDK_DIR = "${PDK_INSTALL_DIR}"
 
 TARGET_dra7xx = "SOC_AM572x"
-TARGET_k2hk   = "SOC_K2H"
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg.inc b/meta-arago-extras/recipes-ti/linalg/linalg.inc
index 6883b990..7cf16c9f 100644
--- a/meta-arago-extras/recipes-ti/linalg/linalg.inc
+++ b/meta-arago-extras/recipes-ti/linalg/linalg.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/ti/linalg/docs/LINALG_1.2.0_manifest.html;md5=f30
 PV = "1_2_0_0"
 INC_PR = "r7"
 
-COMPATIBLE_MACHINE = "k2hk|dra7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 
 require recipes-ti/includes/arago-paths.inc
 require recipes-ti/includes/ti-staging.inc
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
index ce1ce472..3b9220a9 100644
--- a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
+++ b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
@@ -3,9 +3,7 @@ DESCRIPTION = "TI Linear Algebra Library"
 include linalg.inc
 PR = "${INC_PR}.0"
 
-TARGET_k2hk      = "SOC_K2H"
 TARGET_dra7xx        = "SOC_AM572x"
-MEM_MODEL_k2hk   = "Large"
 MEM_MODEL_dra7xx     = "Small"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-arago-extras/recipes-ti/netapi/netapi-test_git.bb b/meta-arago-extras/recipes-ti/netapi/netapi-test_git.bb
deleted file mode 100644
index 3b7825c9..00000000
--- a/meta-arago-extras/recipes-ti/netapi/netapi-test_git.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Provides test and application binaries using NETAPI module"
-
-DEPENDS = "netapi ipsecmgr"
-
-include netapi.inc
-
-PR = "${INC_PR}.1"
-
-EXTRA_OEMAKE = "PDK_INSTALL_PATH=${STAGING_INCDIR}"
-
-do_compile () {
-#   Build the netapi binaries
-	for device in ${DEVICELIST}
-	do
-		for choice in ${CHOICELIST}
-		do
-			oe_runmake -f makefile_armv7 tests NETAPI_SRC_DIR=${S} NETAPI_INC_DIR=${BASEDIR} \
-				USEDYNAMIC_LIB="$choice" DEVICE="$device"
-		done
-
-#     Now build the netapi appplications
-		cd ${S}/applications/ipsec_offload/ipsecmgr/build
-		oe_runmake clean NETAPI_SRC_DIR=${S} DEVICE="$device"
-		oe_runmake app NETAPI_SRC_DIR=${S} DEVICE="$device"
-
-		cd ${S}/applications/ipsec_offload/config-app/build
-		oe_runmake clean DEVICE="$device"
-		oe_runmake app DEVICE="$device"
-		cd ${S}
-	done
-}
-
-do_install () {
-	for device in ${DEVICELIST}
-	do
-		oe_runmake -f makefile_armv7 installbin INSTALL_INC_BASE_DIR=${D}/${includedir} \
-			INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} \
-			SYSCONFDIR=${D}${sysconfdir} DEVICE="$device"
-
-		cd ${S}/applications/ipsec_offload/ipsecmgr/build
-		oe_runmake install \
-			INSTALL_BIN_BASE_DIR=${D}${bindir} SYSCONFDIR=${D}${sysconfdir} \
-			DEVICE="$device"
-
-		cd ${S}/applications/ipsec_offload/config-app/build
-		oe_runmake install \
-			INSTALL_BIN_BASE_DIR=${D}${bindir} SYSCONFDIR=${D}${sysconfdir} \
-			DEVICE="$device"
-		cd ${S}
-	done
-}
diff --git a/meta-arago-extras/recipes-ti/netapi/netapi.inc b/meta-arago-extras/recipes-ti/netapi/netapi.inc
deleted file mode 100644
index ef4607f5..00000000
--- a/meta-arago-extras/recipes-ti/netapi/netapi.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING.txt;md5=f2b4f162358b1ffaf3f2307287ca2074"
-
-COMPATIBLE_MACHINE = "keystone"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEBIAN_NOAUTONAME_${PN} = "1"
-DEBIAN_NOAUTONAME_${PN}-dev = "1"
-DEBIAN_NOAUTONAME_${PN}-dbg = "1"
-DEBIAN_NOAUTONAME_${PN}-staticdev = "1"
-
-NETAPI_GIT_URI = "git://git.ti.com/keystone-rtos/netapi.git"
-NETAPI_GIT_PROTOCOL = "git"
-NETAPI_GIT_BRANCH = "master"
-
-# Below Commit ID corresponds to "DEV.NETAPI.01.01.00.07"
-NETAPI_SRCREV = "50026020384737d253668c4be80745a3653106f8"
-
-BRANCH = "${NETAPI_GIT_BRANCH}"
-SRC_URI = "${NETAPI_GIT_URI};protocol=${NETAPI_GIT_PROTOCOL};branch=${BRANCH}"
-SRCREV = "${NETAPI_SRCREV}"
-
-PV = "01.01.00.07"
-INC_PR = "r0"
-
-DEVICELIST_k2hk = "k2h k2k"
-DEVICELIST_k2l  = "k2l"
-DEVICELIST_k2e  = "k2e"
-
-CHOICELIST = "yes no"
-
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/runtime/netapi"
diff --git a/meta-arago-extras/recipes-ti/netapi/netapi_git.bb b/meta-arago-extras/recipes-ti/netapi/netapi_git.bb
deleted file mode 100644
index 4427ecc2..00000000
--- a/meta-arago-extras/recipes-ti/netapi/netapi_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Provides NETAPI module: TI user space network library"
-
-DEPENDS = "common-csl-ip rm-lld qmss-lld cppi-lld sa-lld hplib pktlib nwal-lld"
-
-include netapi.inc
-
-PR = "${INC_PR}.1"
-
-EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
-
-do_compile () {
-#   Now build the netapi
-	for device in ${DEVICELIST}
-	do
-		for choice in ${CHOICELIST}
-		do
-			oe_runmake  clean NETAPI_SRC_DIR=${S} NETAPI_INC_DIR=${BASEDIR} \
-				USEDYNAMIC_LIB="$choice" DEVICE="$device"
-			oe_runmake lib NETAPI_SRC_DIR=${S} NETAPI_INC_DIR=${BASEDIR} \
-				USEDYNAMIC_LIB="$choice" DEVICE="$device"
-		done
-	done
-}
-
-do_install () {
-	for device in ${DEVICELIST}
-	do
-		oe_runmake install INSTALL_INC_BASE_DIR=${D}${includedir} \
-			INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} \
-			SYSCONFDIR=${D}${sysconfdir} DEVICE="$device"
-	done
-}
diff --git a/meta-arago-extras/recipes-ti/ocl/files/0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch b/meta-arago-extras/recipes-ti/ocl/files/0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch
deleted file mode 100644
index 807639da..00000000
--- a/meta-arago-extras/recipes-ti/ocl/files/0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-ocl: Fix K2x race condition during DSP firmware booting
-
-- Race condition during booting of K2x DSP monitor firmware, causes
-  some DSPs not able to create RPMessage object that communicates with
-  the host (Arm A15).
-- The root cause is that one global data in ipc/RPMessage,
-  "RPMessage_module", is placed in global DDR section shared by all cores.
-- The fix is to place "ipc/RPMessage" global data into core-private memory.
-- MCT-1279
-
-Upstream-Status: Submitted
-
-Signed-off-by: Yuan Zhao <yuanzhao@ti.com>
----
- monitor/cmds/monitor.cmd | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/monitor/cmds/monitor.cmd b/monitor/cmds/monitor.cmd
-index a6a9fb9..6ec4151 100644
---- a/monitor/cmds/monitor.cmd
-+++ b/monitor/cmds/monitor.cmd
-@@ -164,6 +164,13 @@ SECTIONS
-     } run=DDR3_VIRT, load=DDR3_PER_CORE
-      */
- 
-+    /* ipc (e.g. RPMessage_module) need to be private for each core */
-+    .otherlocalfar :
-+    {
-+                "*.ae66"            (.fardata)
-+                "*.ae66"            (.far)
-+    } run=DDR3_VIRT, load=DDR3_PER_CORE
-+
-     .localddr: run=DDR3_VIRT, load=DDR3_PER_CORE
-     .ctools_core_private: run=DDR3_VIRT, load=DDR3_PER_CORE
- 
--- 
-2.17.1
-
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index bb7ff839..8e77302e 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -7,7 +7,7 @@ require recipes-ti/includes/ti-paths.inc
 
 PR = "${INC_PR}.1"
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "opencl opencl-monitor ti-cgt6x-native clocl-native"
@@ -80,8 +80,6 @@ OCL_MPAX_EXAMPLE_LIST = " vecadd_mpax \
                           vecadd_mpax_openmp \
 "
 
-OCL_EXAMPLE_LIST_append_k2hk = " ${OCL_MPAX_EXAMPLE_LIST}"
-
 python do_unpack_append() {
     s = d.getVar("S")
     os.makedirs(s)
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index bb1f37d4..4beadb36 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -12,7 +12,6 @@ REQUIRED_DISTRO_FEATURES = "opencl openmp"
 
 PR = "${INC_PR}.2"
 SRC_URI += "file://0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch;patchdir=.."
-SRC_URI += "file://0002-Fix-K2x-race-condition-during-DSP-firmware-booting.patch;patchdir=.."
 
 inherit update-alternatives
 
@@ -31,37 +30,15 @@ DEPENDS = " ti-llvm3.6-native \
             openmp-rtos \
 "
 
-DEPENDS_append_k2hk = " multiprocmgr-rtos \
-                            qmss-lld-rtos \
-                            cppi-lld-rtos \
-                            rm-lld-rtos \
-"
-
-DEPENDS_append_k2l  = " multiprocmgr-rtos \
-                            qmss-lld-rtos \
-                            cppi-lld-rtos \
-                            rm-lld-rtos \
-"
-
-DEPENDS_append_k2e  = " multiprocmgr-rtos \
-                            qmss-lld-rtos \
-                            cppi-lld-rtos \
-                            rm-lld-rtos \
-"
-
 DEPENDS_append_dra7xx = " opencl-tidl-fw \
 "
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/monitor"
 
 BUILD_TARGET_dra7xx = "ARM_AM57"
-BUILD_TARGET_k2hk = "ARM_K2H"
-BUILD_TARGET_k2l = "ARM_K2L"
-BUILD_TARGET_k2e = "ARM_K2E"
-BUILD_TARGET_k2g = "ARM_K2G"
 
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 export PDK_DIR = "${PDK_INSTALL_DIR}"
@@ -108,28 +85,6 @@ do_install_append_dra7xx() {
     install -m ${OCL_FPERMS} monitor_am57x/dsp1.out ${D}${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}
 }
 
-do_install_append_k2hk() {
-    for i in {0..7}; do install -m ${OCL_FPERMS} monitor_evmk2h/dsp${i}.out ${SHARE_PATH}; done
-    install_dsp_objs evmk2h
-}
-
-do_install_append_k2l() {
-    for i in {0..3}; do install -m ${OCL_FPERMS} monitor_evmk2l/dsp${i}.out ${SHARE_PATH}; done
-    install_dsp_objs evmk2l
-}
-
-do_install_append_k2e() {
-    install -m ${OCL_FPERMS} monitor_evmk2e/dsp0.out ${SHARE_PATH}
-    install_dsp_objs evmk2e
-}
-
-do_install_append_k2g() {
-    install -m ${OCL_FPERMS} monitor_evmk2g/dsp0.out ${SHARE_PATH}
-    install -m ${OCL_FPERMS} monitor_evmk2g/dsp0.out ${SHARE_PATH}/dsp.out
-    install -m ${OCL_FPERMS} monitor_evmk2g/dsp.syms ${SHARE_PATH}
-    install -m ${OCL_FPERMS} monitor_evmk2g/dsp_syms.obj ${SHARE_PATH}
-}
-
 ALTERNATIVE_${PN}_dra7xx = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66"
 ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66"
 ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 48bbc02c..d6399432 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.3"
 
 inherit cmake systemd
 
-COMPATIBLE_MACHINE = "dra7xx|keystone"
+COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Define runtime package for minimal dependencies to run opencl applications
@@ -38,8 +38,6 @@ DEPENDS = " ocl-gl-headers \
 "
 
 DEPENDS_append_dra7xx = " ti-ipc virtual/kernel"
-DEPENDS_append_keystone = " mpm-transport multiprocmgr"
-DEPENDS_remove_k2g = " libulm"
 
 RDEPENDS_${PN}-runtime += "bash ${MONITORS}"
 RDEPENDS_${PN}-dev += "ocl-gl-headers-dev"
@@ -53,13 +51,8 @@ S = "${WORKDIR}/git/host"
 export WANT_LLVM_RELEASE = "3.6-ti"
 
 OCL_BUILD_TARGET_dra7xx = "ARM_AM57"
-OCL_BUILD_TARGET_k2hk = "ARM_K2H"
-OCL_BUILD_TARGET_k2l = "ARM_K2L"
-OCL_BUILD_TARGET_k2e = "ARM_K2E"
-OCL_BUILD_TARGET_k2g = "ARM_K2G"
 
 ENABLE_ULM = "1"
-ENABLE_ULM_k2g = "0"
 SHMEM_MANAGER = "CMEM"
 
 EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABLE_ULM=${ENABLE_ULM} -DOCL_VERSION=${PV} -DSHMEM_MANAGER=${SHMEM_MANAGER}"
@@ -67,7 +60,7 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
 EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
 export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 
-MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
+MCTD = ""
 MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
 
 do_install_append() {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 03/23] linux-libc-headers: correct the version to be 5.10
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 01/23] qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5 Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 02/23] recipes: remove deprecated old platforms Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 04/23] toolchain-gcc: update preferred versions for internal toolchain Denys Dmytriyenko
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This actually pulls the correct 5.10 branch, but when merging from Dunfell,
it was not renamed correctly by mistake. Update the recipe name accordingly.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../{linux-libc-headers_5.4.bb => linux-libc-headers_5.10.bb}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-arago-distro/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.4.bb => linux-libc-headers_5.10.bb} (100%)

diff --git a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
similarity index 100%
rename from meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
rename to meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
-- 
2.25.1


^ permalink raw reply	[flat|nested] 24+ messages in thread

* [PATCH 04/23] toolchain-gcc: update preferred versions for internal toolchain
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (2 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 03/23] linux-libc-headers: correct the version to be 5.10 Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 05/23] meta-arago: convert to new override syntax in honister Denys Dmytriyenko
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

OE-Core now uses GCC 11, plus newer glibc and binutils.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../conf/distro/include/toolchain-gcc.inc        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta-arago-distro/conf/distro/include/toolchain-gcc.inc b/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
index 6f09ecbe..5570594d 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
@@ -13,10 +13,10 @@ PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "binutil
 PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 
 # Set Cross and SDK toolchain preferences
-SDKGCCVERSION ?= "10%"
-SDKBINUVERSION ?= "2.36%"
-SDKGLIBCVERSION ?= "2.33%"
-SDKLINUXLIBCVERSION ?= "5.4%"
+SDKGCCVERSION ?= "11%"
+SDKBINUVERSION ?= "2.38%"
+SDKGLIBCVERSION ?= "2.35%"
+SDKLINUXLIBCVERSION ?= "5.10%"
 
 PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}"
@@ -32,10 +32,10 @@ PREFERRED_VERSION_nativesdk-glibc-initial ?= "${SDKGLIBCVERSION}"
 
 # Set target toolchain preferences to match Cross/SDK by default
 # Can be overwritten globally, if needed
-GCCVERSION ?= "10%"
-BINUVERSION ?= "2.36%"
-GLIBCVERSION ?= "2.33%"
-LINUXLIBCVERSION ?= "5.4%"
+GCCVERSION ?= "11%"
+BINUVERSION ?= "2.38%"
+GLIBCVERSION ?= "2.35%"
+LINUXLIBCVERSION ?= "5.10%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 05/23] meta-arago: convert to new override syntax in honister
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (3 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 04/23] toolchain-gcc: update preferred versions for internal toolchain Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 06/23] conf/machine: remove generic arago machines Denys Dmytriyenko
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Latest "honister" release changes the override syntax to improve usability,
speed and memory footprint. Update recipes with the new syntax and set layer
compatibility to honister.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../classes/image_types_md5.bbclass           |   4 +-
 .../classes/kernel-fitimage.bbclass           |   2 +-
 meta-arago-distro/classes/sourceipk.bbclass   |  12 +-
 .../classes/tisdk-bundle.bbclass              |   8 +-
 meta-arago-distro/classes/uboot-sign.bbclass  |   6 +-
 meta-arago-distro/conf/distro/arago.conf      |  98 ++--
 .../conf/distro/include/arago-prefs.inc       |  20 +-
 .../conf/distro/include/arago-source-ipk.inc  | 458 +++++++++---------
 .../conf/distro/include/branding-amsdk.inc    |  12 +-
 .../conf/distro/include/branding-bleeding.inc |  24 +-
 .../conf/distro/include/branding-core.inc     |   8 +-
 .../conf/distro/include/branding-glsdk.inc    |   4 +-
 .../conf/distro/include/branding-mainline.inc |   4 +-
 .../distro/include/branding-processor-sdk.inc |  16 +-
 .../conf/distro/include/toolchain-arm.inc     |  16 +-
 meta-arago-distro/conf/layer.conf             |   5 +-
 .../conf/machine/arago-armv8.conf             |   2 +-
 .../chromium-ozone-wayland_%.bbappend         |   6 +-
 .../arm-benchmarks/arm-benchmarks_%.bbappend  |   2 +-
 .../glmark2/glmark2_git.bbappend              |   4 +-
 .../stream/stream_%.bbappend                  |   8 +-
 .../alsa-state/alsa-state.bbappend            |   4 +-
 .../bt-enable/bt-enable.bb                    |   4 +-
 .../iproute2/iproute2_%.bbappend              |   6 +-
 .../linuxptp/linuxptp_%.bbappend              |   4 +-
 .../docker/docker%.bbappend                   |   4 +-
 .../arago-gpl-notice/arago-gpl-notice.bb      |   2 +-
 .../base-files/base-files_%.bbappend          |   4 +-
 .../recipes-core/busybox/busybox_%.bbappend   |   6 +-
 .../busybox/softap-udhcpd-config_1.0.bb       |   4 +-
 .../recipes-core/dbus/dbus_%.bbappend         |   2 +-
 .../feed-config/arago-feed-config_1.0.bb      |   4 +-
 .../recipes-core/images/arago-image.inc       |   2 +-
 .../recipes-core/images/tisdk-base-image.bb   |   2 +-
 .../recipes-core/images/tisdk-core-bundle.bb  |  16 +-
 .../recipes-core/images/tisdk-core-bundle.inc |  16 +-
 .../images/tisdk-default-image.bb             |   6 +-
 .../recipes-core/images/tisdk-tiny-image.bb   |   2 +-
 .../init-ifupdown/init-ifupdown_%.bbappend    |   4 +-
 .../meta/external-arm-toolchain.bbappend      |   8 +-
 .../meta/meta-toolchain-arago-tisdk.inc       |   2 +-
 .../packagegroups/build-essential.bb          |   2 +-
 ...kagegroup-arago-base-tisdk-server-extra.bb |   2 +-
 .../packagegroup-arago-base-tisdk.bb          |   2 +-
 .../packagegroups/packagegroup-arago-base.bb  |   2 +-
 .../packagegroup-arago-console.bb             |   4 +-
 .../packagegroup-arago-gst-sdk-target.bb      |   4 +-
 .../packagegroups/packagegroup-arago-gst.bb   |   8 +-
 .../packagegroups/packagegroup-arago-misc.bb  |   2 +-
 .../packagegroups/packagegroup-arago-qte.bb   |   2 +-
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb |  36 +-
 ...kagegroup-arago-tisdk-addons-sdk-target.bb |  28 +-
 .../packagegroup-arago-tisdk-addons.bb        |  46 +-
 ...packagegroup-arago-tisdk-amsdk-sdk-host.bb |  10 +-
 .../packagegroup-arago-tisdk-amsdk.bb         |   6 +-
 ...oup-arago-tisdk-connectivity-sdk-target.bb |   6 +-
 .../packagegroup-arago-tisdk-connectivity.bb  |   2 +-
 ...ackagegroup-arago-tisdk-crypto-sdk-host.bb |  10 +-
 ...kagegroup-arago-tisdk-crypto-sdk-target.bb |   8 +-
 .../packagegroup-arago-tisdk-crypto.bb        |   8 +-
 ...kagegroup-arago-tisdk-graphics-sdk-host.bb |   2 +-
 ...gegroup-arago-tisdk-graphics-sdk-target.bb |   2 +-
 .../packagegroup-arago-tisdk-graphics.bb      |   4 +-
 ...packagegroup-arago-tisdk-gtk-sdk-target.bb |   2 +-
 .../packagegroup-arago-tisdk-gtk.bb           |   2 +-
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  10 +-
 .../packagegroup-arago-tisdk-hmi.bb           |  10 +-
 ...ackagegroup-arago-tisdk-matrix-sdk-host.bb |   2 +-
 .../packagegroup-arago-tisdk-matrix.bb        |  28 +-
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb |  12 +-
 ...group-arago-tisdk-multimedia-sdk-target.bb |  12 +-
 .../packagegroup-arago-tisdk-multimedia.bb    |  14 +-
 ...ackagegroup-arago-tisdk-opencl-sdk-host.bb |   4 +-
 ...kagegroup-arago-tisdk-opencl-sdk-target.bb |   4 +-
 .../packagegroup-arago-tisdk-opencl.bb        |   6 +-
 .../packagegroup-arago-tisdk-qte-sdk-host.bb  |   2 +-
 .../packagegroup-arago-tisdk-qte.bb           |   2 +-
 ...ckagegroup-arago-toolchain-tisdk-target.bb |   4 +-
 .../packagegroup-cross-canadian.bbappend      |   4 +-
 .../packagegroups/ti-analytics.bb             |   8 +-
 .../recipes-core/packagegroups/ti-demos.bb    |  10 +-
 .../recipes-core/packagegroups/ti-opencl.bb   |   4 +-
 .../recipes-core/packagegroups/ti-test.bb     |  18 +-
 .../recipes-core/packagegroups/ti-world.bb    |   8 +-
 .../recipes-core/psplash/psplash_git.bbappend |   6 +-
 .../recipes-core/systemd/systemd_%.bbappend   |  14 +-
 .../recipes-core/sysvinit/sysvinit_%.bbappend |   8 +-
 .../recipes-core/thermal-init/thermal-init.bb |   2 +-
 .../recipes-core/udev/eudev_%.bbappend        |   8 +-
 .../recipes-devtools/cmake/cmake_%.bbappend   |   4 +-
 .../recipes-devtools/perl/perl_%.bbappend     |   2 +-
 .../recipes-devtools/php/php_%.bbappend       |  16 +-
 .../recipes-devtools/pm-qa/pm-qa_%.bbappend   |   4 +-
 .../python/python3_%.bbappend                 |   2 +-
 .../recipes-extended/bash/bash_%.bbappend     |   2 +-
 .../shadow/shadow-securetty_%.bbappend        |   4 +-
 .../recipes-graphics/cairo/cairo_%.bbappend   |   4 +-
 .../recipes-graphics/drm/libdrm_%.bbappend    |   6 +-
 .../freetype/freetype_%.bbappend              |   2 +-
 .../kmscube/kmscube_%.bbappend                |   4 +-
 .../recipes-graphics/tslib/tslib_%.bbappend   |   4 +-
 .../wayland/wayland-ivi-extension_2.2.0.bb    |  10 +-
 .../wayland/weston-init.bbappend              |  10 +-
 .../wayland/weston_9.0.0.bbappend             |   4 +-
 .../cryptodev/cryptodev-module_%.bbappend     |   2 +-
 .../kexec/kexec-tools_%.bbappend              |   6 +-
 .../linux-firmware/linux-firmware_%.bbappend  |  16 +-
 .../linux-libc-headers_5.10.bb                |   2 +-
 .../recipes-kernel/linux/copy-defconfig.inc   |   4 +-
 .../recipes-kernel/linux/docker.inc           |   2 +-
 .../linux/linux-ti-staging-rt_%.bbappend      |   6 +-
 .../linux/linux-ti-staging-systest_%.bbappend |   6 +-
 .../linux/linux-ti-staging_%.bbappend         |   6 +-
 .../ffmpeg/ffmpeg_%.bbappend                  |   4 +-
 .../gstreamer/gstreamer1.0-plugins-%.bbappend |   4 +-
 .../libtiff/tiff_%.bbappend                   |   4 +-
 .../net-snmp/net-snmp_%.bbappend              |   8 +-
 .../examples/qtwebbrowser_1.0.bbappend        |   4 +-
 .../recipes-qt/qt5/qtbase-conf_1.0.bb         |   2 +-
 .../recipes-qt/qt5/qtbase_%.bbappend          |  12 +-
 .../recipes-qt/qt5/qtdeclarative_git.bbappend |   6 +-
 .../recipes-qt/qt5/qtwayland_git.bbappend     |   4 +-
 .../recipes-qt/qt5/qtwebengine_git.bbappend   |   4 +-
 .../recipes-qt/qt5/qtwebkit_%.bbappend        |   8 +-
 .../recipes-support/gnutls/gnutls_%.bbappend  |   2 +-
 .../libnl/libnl_3.5.0.bbappend                |   4 +-
 .../rng-tools/rng-tools_%.bbappend            |   6 +-
 .../strongswan/strongswan_%.bbappend          |   6 +-
 .../syslog-ng/syslog-ng_%.bbappend            |   4 +-
 .../opencl-examples-rtos_git.bbappend         |   2 +-
 .../recipes-tisdk/parse-ip/parse-ip.bb        |   2 +-
 .../ti-tisdk-makefile_1.0.bb                  |  68 +--
 .../ti-tisdk-setup/ti-tisdk-setup.bb          |  16 +-
 .../tisdk-install/tisdk-install_1.0.bb        |   2 +-
 .../tisdk-readme/tisdk-readme.bb              |   2 +-
 .../recipes-tisdk/tisdk-uenv/tisdk-uenv.bb    |   2 +-
 .../unshallow-repositories_1.0.bb             |   4 +-
 meta-arago-extras/classes/qt5.bbclass         |   2 +-
 meta-arago-extras/conf/layer.conf             |   5 +-
 .../barcode-demo/barcode-roi_git.bb           |   4 +-
 .../big-data-ipc-demo-linux_git.bb            |   6 +-
 .../big-data-ipc-demo/big-data-ipc-demo.inc   |   4 +-
 .../image-gallery/image-gallery_git.bb        |   4 +-
 .../pdm-anomaly-detection_git.bb              |   2 +-
 .../point-cloud-viewer_git.bb                 |   6 +-
 .../thermostat-demo/qt-tstat_2.0.bb           |   4 +-
 ...-opencv-opencl-opengl-multithreaded_git.bb |   4 +-
 .../recipes-benchmark/stream/stream_5.10.bb   |   2 +-
 .../switch-config/switch-config_git.bb        |   4 +-
 .../hostap/hostap-daemon-wl18xx.bb            |  10 +-
 .../recipes-connectivity/hostap/hostap.inc    |   2 +-
 .../open62541/open62541_git.bb                |  14 +-
 .../recipes-connectivity/vtun/vtun_3.0.3.bb   |   2 +-
 .../wpa-supplicant/wpa-supplicant-wl18xx.bb   |  12 +-
 .../wpa-supplicant/wpa-supplicant.inc         |  12 +-
 .../recipes-core/am-sysinfo/am-sysinfo_git.bb |   2 +-
 .../recipes-core/llvm/llvm-common.bb          |   6 +-
 .../recipes-core/llvm/llvm-common.bbappend    |   4 +-
 meta-arago-extras/recipes-core/llvm/llvm.inc  |  30 +-
 .../recipes-core/llvm/ti-llvm3.6_3.6.bb       |  22 +-
 .../matrix/matrix-gui-3d-demos_2.0.bb         |  84 ++--
 .../matrix/matrix-gui-analytics-demos_2.0.bb  |   8 +-
 .../matrix/matrix-gui-apps-git.inc            |   2 +-
 .../matrix/matrix-gui-apps-images_2.0.bb      |   2 +-
 .../recipes-core/matrix/matrix-gui-apps.inc   |   2 +-
 .../matrix-gui-armbenchmarks-demos_2.0.bb     |   6 +-
 .../matrix/matrix-gui-browser-demos_2.0.bb    |   6 +-
 .../matrix/matrix-gui-camera-loopback_2.0.bb  |   4 +-
 .../matrix/matrix-gui-clocks_2.0.bb           |   8 +-
 .../matrix/matrix-gui-crypto-demos_2.0.bb     |  10 +-
 .../matrix/matrix-gui-display-control_2.0.bb  |   4 +-
 .../matrix/matrix-gui-ethernet-demos_2.0.bb   |   8 +-
 .../matrix/matrix-gui-helper-scripts.bb       |   4 +-
 .../matrix/matrix-gui-hmi-demos_2.0.bb        |  20 +-
 .../matrix-gui-machinevision-demos_2.0.bb     |  28 +-
 .../matrix/matrix-gui-mc-demos_2.0.bb         |  12 +-
 .../matrix/matrix-gui-multimedia-demos_2.0.bb |  74 +--
 .../matrix/matrix-gui-opencl-demos_2.0.bb     |  20 +-
 .../matrix/matrix-gui-oprofile-demos_2.0.bb   |   4 +-
 .../matrix/matrix-gui-pm-demos_2.0.bb         |  28 +-
 .../matrix/matrix-gui-pru-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-qt4-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-qt5-demos_2.0.bb        |  22 +-
 .../matrix/matrix-gui-settings-demos_2.0.bb   |   8 +-
 .../matrix/matrix-gui-submenus_2.0.bb         |  52 +-
 .../matrix/matrix-gui-tidl-demos_2.0.bb       |  62 +--
 .../matrix/matrix-gui-touch-demos_2.0.bb      |   4 +-
 .../matrix/matrix-gui-usb-demos_2.0.bb        |   4 +-
 .../matrix/matrix-gui-utility-demos_2.0.bb    |   8 +-
 .../matrix/matrix-gui-v4l2-demos_2.0.bb       |   4 +-
 .../matrix-gui-video-analytics-demos_2.0.bb   |   4 +-
 .../matrix/matrix-gui-wifi-demos_2.0.bb       |   4 +-
 .../recipes-core/matrix/matrix-gui/php.ini    |   2 +-
 .../recipes-core/matrix/matrix-gui_2.0.bb     |   6 +-
 .../matrix/matrix-lighttpd-config.bb          |   6 +-
 .../meta/external-arm-sdk-toolchain.bb        |  32 +-
 .../meta/external-arm-toolchain.bbappend      |  20 +-
 .../meta/meta-toolchain-arago-qte.bb          |   2 +-
 .../recipes-core/meta/meta-toolchain-arago.bb |   2 +-
 ...k-packagegroup-arago-qte-toolchain-host.bb |   2 +-
 ...nativesdk-packagegroup-arago-tisdk-host.bb |   4 +-
 ...packagegroup-arago-qte-toolchain-target.bb |   2 +-
 ...ackagegroup-arago-standalone-sdk-target.bb |   2 +-
 .../ti-pru-sw-app-loader_1.00.00.bb           |   4 +-
 .../ti-pru-sw-edma-library_1.00.00.bb         |   6 +-
 .../ti-pru-sw-examples_1.00.00.bb             |   8 +-
 .../cmake/extra-cmake-modules.bb              |   2 +-
 .../recipes-devtools/dt/dt_17.07.bb           |   2 +-
 .../flatbuffers/flatbuffers_1.11.0.bb         |   6 +-
 .../input-utils/input-utils_1.0.bb            |   2 +-
 .../ltp-ddt/ltp-ddt_20210524.bb               |  16 +-
 .../mtd/mtd-utils_git.bbappend                |   8 +-
 .../opkg/opkg-bash-completion.bb              |   4 +-
 .../pinmux-utility_1.0.1076.3.bb              |   2 +-
 .../pinmux-utility/pinmux-utility_2.5.2.0.bb  |   2 +-
 .../recipes-devtools/statcol/statcol.bb       |   6 +-
 .../util-scripts/glsdk-util-scripts.bb        |   4 +-
 .../websocketd/websocketd_0.4.1.bb            |   2 +-
 .../recipes-extended/ltp/ltp_20200120.bb      |  20 +-
 .../recipes-extended/ltp/ltp_20210524.bb      |  20 +-
 .../recipes-graphics/glfw/glfw_git.bb         |   2 +-
 .../glsdk-example-apps/glsdk-example-apps.bb  |   6 +-
 .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb          |  10 +-
 .../recipes-graphics/kms++/kms++_git.bb       |   6 +-
 .../ti-gc320-tests_5.0.11.p7.bb               |   4 +-
 .../tslib/ts-calibrate-init_1.0.bb            |   2 +-
 .../wayland/wayland-protocols_%.bbappend      |   6 +-
 .../timestamping/timestamping_4.1.bb          |   2 +-
 .../amsdk-av-files/amsdk-av-files_1.4.bb      |  10 +-
 .../dual-camera-demo/dual-camera-demo_1.0.bb  |   8 +-
 .../gstreamer1.0-plugins-dsp66_git.bb         |  16 +-
 .../gstreamer1.0-plugins-ducati_git.bb        |   2 +-
 .../gstreamer1.0-plugins-hevc_git.bb          |   8 +-
 .../gstreamer1.0-plugins-ti.inc               |   6 +-
 .../gstreamer1.0-plugins-bad_1.16.%.bbappend  |  18 +-
 .../gstreamer1.0-plugins-good_1.18.%.bbappend |   6 +-
 .../hevc-arm-decoder/hevc-arm-decoder_git.bb  |   4 +-
 .../recipes-qt/examples/qtwebbrowser_1.0.bb   |   4 +-
 .../arm-compute-library_git.bb                |  12 +-
 .../recipes-support/cclink/ccief-basic_git.bb |   2 +-
 .../recipes-support/devmem2/devmem2.bbappend  |   2 +-
 .../recipes-support/mstpctl/mstpd_git.bb      |   4 +-
 .../tensorflow-lite-demo_git.bb               |   8 +-
 .../tensorflow-lite/tensorflow-lite_1.15.bb   |  14 +-
 .../recipes-ti/fftlib/fftlib_git.bb           |   8 +-
 .../recipes-ti/fftlib/ti-fftw-examples_git.bb |   6 +-
 .../recipes-ti/fftlib/ti-fftw_git.bb          |   8 +-
 .../libarch/libarch-examples_git.bb           |   8 +-
 .../recipes-ti/libarch/libarch.inc            |   2 +-
 .../recipes-ti/libarch/libarch_git.bb         |   6 +-
 .../recipes-ti/linalg/linalg-examples_git.bb  |   8 +-
 .../recipes-ti/linalg/linalg_git.bb           |  12 +-
 .../recipes-ti/llvm-rtos/llvm-rtos_git.bb     |   6 +-
 .../recipes-ti/ocl-rtos/clocl-rtos_git.bb     |   4 +-
 .../recipes-ti/ocl-rtos/clocl-win_git.bb      |   2 +-
 .../ocl-rtos/opencl-examples-rtos_git.bb      |   4 +-
 .../ocl-rtos/opencl-monitor-rtos_git.bb       |   8 +-
 .../recipes-ti/ocl-rtos/opencl-rtos_git.bb    |  14 +-
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb |   8 +-
 .../recipes-ti/ocl/ocl-gl-headers_git.bb      |   2 +-
 meta-arago-extras/recipes-ti/ocl/ocl.inc      |   2 +-
 .../recipes-ti/ocl/opencl-examples_git.bb     |  34 +-
 .../recipes-ti/ocl/opencl-monitor-ipu_git.bb  |   6 +-
 .../recipes-ti/ocl/opencl-monitor_git.bb      |  14 +-
 .../recipes-ti/ocl/opencl-tidl-fw_git.bb      |   4 +-
 .../recipes-ti/ocl/opencl_git.bb              |  26 +-
 .../recipes-ti/openmpacc/clacc_git.bb         |   8 +-
 .../openmpacc/openmpacc-examples_git.bb       |  10 +-
 .../recipes-ti/openmpacc/openmpacc.inc        |   6 +-
 .../recipes-ti/openmpacc/openmpacc_git.bb     |   6 +-
 .../recipes-ti/tidl-api/tidl-api.inc          |   4 +-
 .../recipes-ti/tidl-api/tidl-api_git.bb       |   6 +-
 .../recipes-ti/tidl-api/tidl-examples_git.bb  |   6 +-
 .../recipes-ti/tidl-api/tidl-viewer_git.bb    |  10 +-
 .../recipes-ti/tidl-utils/tidl-import_git.bb  |   4 +-
 .../recipes-ti/tidl-utils/tidl-utils.bb       |  12 +-
 .../recipes-ti/tiovx/tiovx-app-host.bb        |  16 +-
 .../recipes-ti/tiovx/tiovx-lib-host.bb        |   6 +-
 .../recipes-ti/tiovx/tiovx-sys-iface.bb       |  10 +-
 279 files changed, 1428 insertions(+), 1430 deletions(-)

diff --git a/meta-arago-distro/classes/image_types_md5.bbclass b/meta-arago-distro/classes/image_types_md5.bbclass
index 9e2c04fa..16324ca5 100644
--- a/meta-arago-distro/classes/image_types_md5.bbclass
+++ b/meta-arago-distro/classes/image_types_md5.bbclass
@@ -1,9 +1,9 @@
 inherit image_types
 
 COMPRESSIONTYPES += "gz.md5"
-COMPRESS_CMD_gz.md5 = "${COMPRESS_CMD_gz}; md5sum ${IMAGE_NAME}.rootfs.${type}.gz > ${IMAGE_NAME}.rootfs.${type}.gz.md5"
+COMPRESS_CMD:gz.md5 = "${COMPRESS_CMD_gz}; md5sum ${IMAGE_NAME}.rootfs.${type}.gz > ${IMAGE_NAME}.rootfs.${type}.gz.md5"
 IMAGE_TYPES += "tar.gz.md5"
 
 COMPRESSIONTYPES += "xz.md5"
-COMPRESS_CMD_xz.md5 = "${COMPRESS_CMD_xz}; md5sum ${IMAGE_NAME}.rootfs.${type}.xz > ${IMAGE_NAME}.rootfs.${type}.xz.md5"
+COMPRESS_CMD:xz.md5 = "${COMPRESS_CMD_xz}; md5sum ${IMAGE_NAME}.rootfs.${type}.xz > ${IMAGE_NAME}.rootfs.${type}.xz.md5"
 IMAGE_TYPES += "tar.xz.md5"
diff --git a/meta-arago-distro/classes/kernel-fitimage.bbclass b/meta-arago-distro/classes/kernel-fitimage.bbclass
index 430fa5d0..f412f4c9 100644
--- a/meta-arago-distro/classes/kernel-fitimage.bbclass
+++ b/meta-arago-distro/classes/kernel-fitimage.bbclass
@@ -728,7 +728,7 @@ FITIMAGE_INITRAMFS_ITB_IMAGE[vardepsexclude] = "DATETIME"
 FITIMAGE_INITRAMFS_ITB_BINARY ?= "fitImage-${INITRAMFS_IMAGE}.${FITIMAGE_ITB_SUFFIX}"
 FITIMAGE_INITRAMFS_ITB_SYMLINK ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.${FITIMAGE_ITB_SUFFIX}"
 
-kernel_do_deploy_append() {
+kernel_do_deploy:append() {
 	# Update deploy directory
 	if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
 		cd ${B}
diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
index 817f5b72..5ffb75a8 100644
--- a/meta-arago-distro/classes/sourceipk.bbclass
+++ b/meta-arago-distro/classes/sourceipk.bbclass
@@ -28,7 +28,7 @@
 # 
 # Creation of the source ipk can be controlled per package by setting
 # CREATE_SRCIPK = "1" in the package recipe or by setting
-# CREATE_SRCIPK_pn-<package name> = "1" in your local.conf
+# CREATE_SRCIPK:pn-<package name> = "1" in your local.conf
 #
 #TODO: 
 # Need to figure out how to use opkg-build in this class.
@@ -89,7 +89,7 @@ SRCIPK_SHALLOW_DEPTH ?= "1"
 get_remote() {
     git_repo="$1"
 
-    if [ "$git_repo" == "" ]
+    if [ "$git_repo" = "" ]
     then
         echo "git_repo not passed to get_remote"
         exit 1
@@ -167,7 +167,7 @@ adjust_git() {
         then
             # If SRCIPK_SHALLOW_CLONE is true then make a shallow copy of the
             # git repository and then fix up the git URLs
-            if [ "${SRCIPK_SHALLOW_CLONE}" == "true" ]
+            if [ "${SRCIPK_SHALLOW_CLONE}" = "true" ]
             then
                 limit_git_history
             fi
@@ -286,17 +286,17 @@ python () {
 PACKAGES_DYNAMIC += "${PN}-source"
 
 # Do not perform any QA checks on sourceipk packages
-INSANE_SKIP_${PN}-source += "${@oe.utils.conditional("${CREATE_SRCIPK}", "0", "", "${ALL_QA}", d)}"
+INSANE_SKIP:${PN}-source += "${@oe.utils.conditional("${CREATE_SRCIPK}", "0", "", "${ALL_QA}", d)}"
 
 python __anonymous () {
     if d.getVar("CREATE_SRCIPK") != "0":
         if '${PN}-source' not in d.getVar("PACKAGES", False):
             d.appendVar('PACKAGES', ' ${PN}-source')
         pn = d.getVar("PN")
-        d.setVar('FILES_%s-source' % (pn), '${SRCIPK_INSTALL_DIR}')
+        d.setVar('FILES:%s-source' % (pn), '${SRCIPK_INSTALL_DIR}')
 }
 
-PACKAGESPLITFUNCS_append = " ${@oe.utils.conditional('CREATE_SRCIPK','0','','populate_srcipk_package',d)}"
+PACKAGESPLITFUNCS:append = " ${@oe.utils.conditional('CREATE_SRCIPK','0','','populate_srcipk_package',d)}"
 populate_srcipk_package() {
     install -d ${PKGDEST}/${PN}-source/${SRCIPK_INSTALL_DIR}
     cp -Prf --preserve=mode,timestamps --no-preserve=ownership \
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index ac2eb747..0e5d2391 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -9,8 +9,8 @@ IMAGE_FEATURES ?= ""
 IMAGE_FEATURES[type] = "list"
 
 # Always add the sdk_base feature
-IMAGE_FEATURES_prepend = "sdk_base package-management "
-SDKIMAGE_FEATURES_prepend = "package-management "
+IMAGE_FEATURES:prepend = "sdk_base package-management "
+SDKIMAGE_FEATURES:prepend = "package-management "
 
 # Define our always included sdk package group as the IMAGE_INSTALL settings
 # like you would expect.
@@ -19,7 +19,7 @@ FEATURE_PACKAGES_sdk_base = "${IMAGE_INSTALL}"
 # Create the list of packages to be installed
 PACKAGE_INSTALL = "${@' '.join(oe.packagegroup.required_packages('${IMAGE_FEATURES}'.split(), d))}"
 
-RDEPENDS_${PN} += "${@' '.join(oe.packagegroup.active_packages('${IMAGE_FEATURES}'.split(), d))}"
+RDEPENDS:${PN} += "${@' '.join(oe.packagegroup.active_packages('${IMAGE_FEATURES}'.split(), d))}"
 
 # "export IMAGE_BASENAME" not supported at this time
 IMAGE_BASENAME[export] = "1"
@@ -692,7 +692,7 @@ generate_sw_manifest() {
 
 ROOTFS_PREPROCESS_COMMAND += "tisdk_image_setup; "
 ROOTFS_POSTPROCESS_COMMAND += "tisdk_image_build; "
-IMAGE_PREPROCESS_COMMAND_append = "tisdk_image_cleanup; "
+IMAGE_PREPROCESS_COMMAND:append = "tisdk_image_cleanup; "
 
 # Create the SDK image.  We will re-use the rootfs_ipk_do_rootfs functionality
 # to install a given list of packages using opkg.
diff --git a/meta-arago-distro/classes/uboot-sign.bbclass b/meta-arago-distro/classes/uboot-sign.bbclass
index 982ed46d..102232b9 100644
--- a/meta-arago-distro/classes/uboot-sign.bbclass
+++ b/meta-arago-distro/classes/uboot-sign.bbclass
@@ -19,7 +19,7 @@
 # The tasks sequence is set as below, using DEPLOY_IMAGE_DIR as common place to
 # treat the device tree blob:
 #
-# * u-boot:do_install_append
+# * u-boot:do_install:append
 #   Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for
 #   signing, and kernel will deploy UBOOT_DTB_BINARY after signs it.
 #
@@ -103,7 +103,7 @@ install_helper() {
 	fi
 }
 
-do_install_append() {
+do_install:append() {
 	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then
 		if [ -n "${UBOOT_CONFIG}" ]; then
 			for config in ${UBOOT_MACHINE}; do
@@ -125,7 +125,7 @@ python () {
         d.appendVarFlag('do_deploy', 'depends', ' %s:do_deploy' % kernel_pn)
 
         # kernerl's do_deploy is a litle special, so we can't use
-        # do_deploy_append, otherwise it would override
+        # do_deploy:append, otherwise it would override
         # kernel_do_deploy.
         d.appendVarFlag('do_deploy', 'prefuncs', ' concat_dtb')
 }
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 35741ea9..0aab847b 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -6,7 +6,7 @@ BUILD_VARIANT = "${@['prod','rt','systest'][int(d.getVar('ARAGO_RT_ENABLE'))+int
 TISDK_VERSION ?= "live"
 FEEDURIPREFIX ?= "packages/${DISTRO}-dunfell/${TISDK_VERSION}/${BUILD_VARIANT}/"
 
-OPKG_ARGS_remove = "--prefer-arch-to-version"
+OPKG_ARGS:remove = "--prefer-arch-to-version"
 
 TI_MIRROR = "http://software-dl.ti.com/processor-sdk-mirror/sources/"
 MIRRORS += " \
@@ -33,28 +33,28 @@ SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_VERSION}"
 SDKPATH_REAL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_VERSION}"
 SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}"
 
-IMAGE_CLASSES += "image_types_md5"
-IMAGE_FSTYPES += "tar.xz.md5"
+#IMAGE_CLASSES += "image_types_md5"
+#IMAGE_FSTYPES += "tar.xz.md5"
 
 # FIT image for secure devices
 KERNEL_CLASSES += "kernel-fitimage"
 FITIMAGE_HASH_ALGO = ""
 FITIMAGE_PACK_TEE = "0"
-FITIMAGE_PACK_TEE_am437x-hs-evm = "1"
-FITIMAGE_PACK_TEE_am57xx-hs-evm = "1"
-FITIMAGE_PACK_TEE_dra7xx-hs-evm = "1"
+FITIMAGE_PACK_TEE:am437x-hs-evm = "1"
+FITIMAGE_PACK_TEE:am57xx-hs-evm = "1"
+FITIMAGE_PACK_TEE:dra7xx-hs-evm = "1"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
 
-KERNEL_IMAGETYPES_dra7xx-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES_am57xx-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES_am437x-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES_am335x-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES_am65xx-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES_am64xx-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES_j7-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES_j7200-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:dra7xx-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am57xx-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am437x-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am335x-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am65xx-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:am64xx-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:j7-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:j7200-hs-evm = "Image fitImage"
 
 # Extra boot files for WIC images
 do_image_wic[depends] += "tisdk-uenv:do_deploy"
@@ -70,18 +70,18 @@ TMPDIR .= "${TCMODEAPPEND}"
 DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
 
 # Remove some unwanted features
-DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES:remove = "x11"
 
 # Add additional distro features
-DISTRO_FEATURES_append = " pam wayland opengl"
-#DISTRO_FEATURES_append = " opencl"
-DISTRO_FEATURES_append = " opencv"
-DISTRO_FEATURES_append = " openmp"
+DISTRO_FEATURES:append = " pam wayland opengl"
+#DISTRO_FEATURES:append = " opencl"
+DISTRO_FEATURES:append = " opencv"
+DISTRO_FEATURES:append = " openmp"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE_append = " opencl opencv openmp"
-DISTRO_FEATURES_FILTER_NATIVESDK_append = " opencl opencv openmp"
+DISTRO_FEATURES_FILTER_NATIVE:append = " opencl opencv openmp"
+DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl opencv openmp"
 
 # Set global runtime providers for major components
 ARAGO_SYSVINIT ?= "0"
@@ -91,53 +91,53 @@ VIRTUAL-RUNTIME_initscripts = "${@["initscripts", "systemd-compat-units"][bool(d
 VIRTUAL-RUNTIME_initramfs = "${@["sysvinit-initramfs", "systemd-initramfs"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
 VIRTUAL-RUNTIME_login_manager = "busybox shadow"
 
-DISTRO_FEATURES_append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
+DISTRO_FEATURES:append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
 
 # Distro-specific package configuration
-PACKAGECONFIG_append_pn-systemd = " coredump"
+PACKAGECONFIG:append:pn-systemd = " coredump"
 
 # Configure Qt5 flags (GLES is still required for qtdeclarative and qtwebkit)
-PACKAGECONFIG_GL_pn-qtbase = "gles2 linuxfb"
-PACKAGECONFIG_DISTRO_pn-qtbase = "icu examples accessibility gif gbm kms libinput"
-PACKAGECONFIG_FONTS_pn-qtbase = "fontconfig"
+PACKAGECONFIG_GL:pn-qtbase = "gles2 linuxfb"
+PACKAGECONFIG_DISTRO:pn-qtbase = "icu examples accessibility gif gbm kms libinput"
+PACKAGECONFIG_FONTS:pn-qtbase = "fontconfig"
 
 # Add gstreamer in package configuration to enable video
-PACKAGECONFIG_append_pn-qtmultimedia = " gstreamer"
+PACKAGECONFIG:append:pn-qtmultimedia = " gstreamer"
 
 # Add examples in Qt5 package configurations
-PACKAGECONFIG_append_pn-qtcharts = " examples"
-#PACKAGECONFIG_append_pn-qtdeclarative = " examples"
-PACKAGECONFIG_append_pn-qtlocation = " examples"
-PACKAGECONFIG_append_pn-qtmultimedia = " examples"
-PACKAGECONFIG_append_pn-qtscript = " examples"
-PACKAGECONFIG_append_pn-qtserialport = " examples"
-PACKAGECONFIG_append_pn-qtsvg = " examples"
-PACKAGECONFIG_append_pn-qtwayland = " examples"
-PACKAGECONFIG_append_pn-qtwebengine = " examples"
+PACKAGECONFIG:append:pn-qtcharts = " examples"
+#PACKAGECONFIG:append:pn-qtdeclarative = " examples"
+PACKAGECONFIG:append:pn-qtlocation = " examples"
+PACKAGECONFIG:append:pn-qtmultimedia = " examples"
+PACKAGECONFIG:append:pn-qtscript = " examples"
+PACKAGECONFIG:append:pn-qtserialport = " examples"
+PACKAGECONFIG:append:pn-qtsvg = " examples"
+PACKAGECONFIG:append:pn-qtwayland = " examples"
+PACKAGECONFIG:append:pn-qtwebengine = " examples"
 
 # Prefer OpenSSL over GnuTLS for curl due to TSU exemptions
-PACKAGECONFIG_pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} ssl zlib"
+PACKAGECONFIG:pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} ssl zlib"
 
-PACKAGECONFIG_pn-glmark2 = "drm-gles2 wayland-gles2"
+PACKAGECONFIG:pn-glmark2 = "drm-gles2 wayland-gles2"
 
 # Enable encryption support in open62541
-PACKAGECONFIG_append_pn-open62541 = " encrypt"
+PACKAGECONFIG:append:pn-open62541 = " encrypt"
 
 # Enable netperf intervals/pacing and histogram
-PACKAGECONFIG_append_pn-netperf = " intervals histogram"
+PACKAGECONFIG:append:pn-netperf = " intervals histogram"
 
 # Use OpenGL ES2 for SDL2
-PACKAGECONFIG_GL_pn-libsdl2 = "gles2"
+PACKAGECONFIG_GL:pn-libsdl2 = "gles2"
 
 # Add KMS/DRM backend support
-PACKAGECONFIG_append_pn-libsdl2 = " kmsdrm"
+PACKAGECONFIG:append:pn-libsdl2 = " kmsdrm"
 
 # Enable cryptodev/devcrypto engine in OpenSSL 1.1
-PACKAGECONFIG_append_pn-openssl = " cryptodev-linux"
+PACKAGECONFIG:append:pn-openssl = " cryptodev-linux"
 
 # Disable pulseaudio routing in alsa by default
-PACKAGECONFIG_remove_pn-alsa-plugins = "pulseaudio"
-RDEPENDS_pulseaudio-server_remove = "alsa-plugins-pulseaudio-conf"
+PACKAGECONFIG:remove:pn-alsa-plugins = "pulseaudio"
+RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
 
 # Enable UI and scripting for perf
 PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
@@ -149,18 +149,18 @@ ARAGO_KERNEL_SUFFIX ?= ""
 
 # Set real-time kernel suffix
 ARAGO_RT_ENABLE ?= "0"
-ARAGO_KERNEL_SUFFIX_append = "${@oe.utils.conditional("ARAGO_RT_ENABLE", "1", "-rt", "", d)}"
+ARAGO_KERNEL_SUFFIX:append = "${@oe.utils.conditional("ARAGO_RT_ENABLE", "1", "-rt", "", d)}"
 
 # Set systest kernel suffix
 ARAGO_SYSTEST_ENABLE ?= "0"
-ARAGO_KERNEL_SUFFIX_append = "${@oe.utils.conditional("ARAGO_SYSTEST_ENABLE", "1", "-systest", "", d)}"
-IMAGE_FSTYPES_remove = "${@['','ubi ubifs'][d.getVar('ARAGO_SYSTEST_ENABLE') == '1']}"
+ARAGO_KERNEL_SUFFIX:append = "${@oe.utils.conditional("ARAGO_SYSTEST_ENABLE", "1", "-systest", "", d)}"
+IMAGE_FSTYPES:remove = "${@['','ubi ubifs'][d.getVar('ARAGO_SYSTEST_ENABLE') == '1']}"
 
 # Toolchain should be selected by setting TOOLCHAIN_BRAND in local.conf
 # Set some sane defaults, in case someone forgets to set them in local.conf
 TC_SANE_DEFAULT ?= "arm"
 TOOLCHAIN_TYPE ?= "external"
-TOOLCHAIN_TYPE_omapl1 = "internal"
+TOOLCHAIN_TYPE:omapl1 = "internal"
 TOOLCHAIN_BRAND ?= "${@[d.getVar('TC_SANE_DEFAULT'),'gcc'][d.getVar('TOOLCHAIN_TYPE') == 'internal']}"
 
 require conf/distro/include/toolchain-${TOOLCHAIN_BRAND}.inc
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 2bf9f103..9c4a533c 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -15,18 +15,14 @@ PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
 
 # J7 has a Rogue GPU core
-PREFERRED_PROVIDER_virtual/egl_j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1_j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2_j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm_j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver_j7 = "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/egl:j7 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1:j7 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2:j7 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm:j7 = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver:j7 = "ti-img-rogue-driver"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging${ARAGO_KERNEL_SUFFIX}"
 
-# For TI devices with only baremetal/TI RTOS support
-PREFERRED_PROVIDER_virtual/kernel_c66x = "linux-dummy"
-PREFERRED_PROVIDER_virtual/kernel_omapl137 = "linux-dummy"
-
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 
 # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or
@@ -35,6 +31,6 @@ PREFERRED_VERSION_crda = "3.18"
 PREFERRED_VERSION_obex = "0.34"
 
 PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
-#PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
-#PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
-#PREFERRED_PROVIDER_wpa-supplicant_omap-a15 = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant:ti33x = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant:ti43x = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant:omap-a15 = "wpa-supplicant-wl18xx"
diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
index 22484cf4..c03d5383 100644
--- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
+++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
@@ -18,19 +18,19 @@
 #       PREFERRED_VERSION_udev_omap3evm = "124"
 #
 #   Enable source ipk creation for a package
-#       CREATE_SRCIPK_pn-<pkg> = "1"
+#       CREATE_SRCIPK:pn-<pkg> = "1"
 #   i.e.
-#       CREATE_SRCIPK_pn-u-boot = "1"
+#       CREATE_SRCIPK:pn-u-boot = "1"
 #
 #   Change install diretory of source ipk for a package
-#       SRCIPK_INSTALL_DIR_pn-<pkg> = "<install dir>"
+#       SRCIPK_INSTALL_DIR:pn-<pkg> = "<install dir>"
 #   i.e.
-#       SRCIPK_INSTALL_DIR_pn-u-boot = "board-support/u-boot-source"
+#       SRCIPK_INSTALL_DIR:pn-u-boot = "board-support/u-boot-source"
 #
 #   Change source ipk architecture for a package
-#       SRCIPK_PACKAGE_ARCH_pn-<pkg> = "<arch>"
+#       SRCIPK_PACKAGE_ARCH:pn-<pkg> = "<arch>"
 #   i.e.
-#       SRCIPK_PACKAGE_ARCH_pn-u-boot = "${MACHINE_ARCH}"
+#       SRCIPK_PACKAGE_ARCH:pn-u-boot = "${MACHINE_ARCH}"
 #===============================================================================
 
 # Enable the creation of source ipks
@@ -40,329 +40,329 @@ INHERIT += "sourceipk"
 SRCIPK_INCLUDE_EXTRAFILES = "0"
 
 # Set source ipk packages and install directories
-CREATE_SRCIPK_pn-ti-tisdk-licenses ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-tisdk-licenses ?= "docs/licenses"
+CREATE_SRCIPK:pn-ti-tisdk-licenses ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-tisdk-licenses ?= "docs/licenses"
 
-CREATE_SRCIPK_pn-matrix-gui ?= "1"
-SRCIPK_INSTALL_DIR_pn-matrix-gui ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-matrix-gui ?= "1"
+SRCIPK_INSTALL_DIR:pn-matrix-gui ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-crypto-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-crypto-examples ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-ti-crypto-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-crypto-examples ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-qml-carinfo ?= "1"
-SRCIPK_INSTALL_DIR_pn-qml-carinfo ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-qml-carinfo ?= "1"
+SRCIPK_INSTALL_DIR:pn-qml-carinfo ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-quick-playground ?= "1"
-SRCIPK_INSTALL_DIR_pn-quick-playground ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-quick-playground ?= "1"
+SRCIPK_INSTALL_DIR:pn-quick-playground ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-qt-catalog ?= "1"
-SRCIPK_INSTALL_DIR_pn-qt-catalog ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-qt-catalog ?= "1"
+SRCIPK_INSTALL_DIR:pn-qt-catalog ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-qt-patientcare ?= "1"
-SRCIPK_INSTALL_DIR_pn-qt-patientcare ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-qt-patientcare ?= "1"
+SRCIPK_INSTALL_DIR:pn-qt-patientcare ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-qt-tstat ?= "1"
-SRCIPK_INSTALL_DIR_pn-qt-tstat ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-qt-tstat ?= "1"
+SRCIPK_INSTALL_DIR:pn-qt-tstat ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-dual-camera-demo ?= "1"
-SRCIPK_INSTALL_DIR_pn-dual-camera-demo ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-dual-camera-demo ?= "1"
+SRCIPK_INSTALL_DIR:pn-dual-camera-demo ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-evse-hmi ?= "1"
-SRCIPK_INSTALL_DIR_pn-evse-hmi ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-evse-hmi ?= "1"
+SRCIPK_INSTALL_DIR:pn-evse-hmi ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-protection-relays-hmi ?= "1"
-SRCIPK_INSTALL_DIR_pn-protection-relays-hmi ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-protection-relays-hmi ?= "1"
+SRCIPK_INSTALL_DIR:pn-protection-relays-hmi ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-mmwavegesture-hmi ?= "1"
-SRCIPK_INSTALL_DIR_pn-mmwavegesture-hmi ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-mmwavegesture-hmi ?= "1"
+SRCIPK_INSTALL_DIR:pn-mmwavegesture-hmi ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-pdm-anomaly-detection ?= "1"
-SRCIPK_INSTALL_DIR_pn-pdm-anomaly-detection ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-pdm-anomaly-detection ?= "1"
+SRCIPK_INSTALL_DIR:pn-pdm-anomaly-detection ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-tiovx-app-host ?= "1"
-SRCIPK_INSTALL_DIR_pn-tiovx-app-host ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-tiovx-app-host ?= "1"
+SRCIPK_INSTALL_DIR:pn-tiovx-app-host ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-image-gallery ?= "1"
-SRCIPK_INSTALL_DIR_pn-image-gallery ?= "example-applications/${PN}"
+CREATE_SRCIPK:pn-image-gallery ?= "1"
+SRCIPK_INSTALL_DIR:pn-image-gallery ?= "example-applications/${PN}"
 
-CREATE_SRCIPK_pn-matrix-gui-browser ?= "1"
-SRCIPK_INSTALL_DIR_pn-matrix-gui-browser ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-matrix-gui-browser ?= "1"
+SRCIPK_INSTALL_DIR:pn-matrix-gui-browser ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-refresh-screen ?= "1"
-SRCIPK_INSTALL_DIR_pn-refresh-screen ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-refresh-screen ?= "1"
+SRCIPK_INSTALL_DIR:pn-refresh-screen ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-am-sysinfo ?= "1"
-SRCIPK_INSTALL_DIR_pn-am-sysinfo ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-am-sysinfo ?= "1"
+SRCIPK_INSTALL_DIR:pn-am-sysinfo ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-oprofile-example ?= "1"
-SRCIPK_INSTALL_DIR_pn-oprofile-example ?= "example-applications/${PN}"
+CREATE_SRCIPK:pn-oprofile-example ?= "1"
+SRCIPK_INSTALL_DIR:pn-oprofile-example ?= "example-applications/${PN}"
 
-CREATE_SRCIPK_pn-arm-benchmarks ?= "1"
-SRCIPK_INSTALL_DIR_pn-arm-benchmarks ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-arm-benchmarks ?= "1"
+SRCIPK_INSTALL_DIR:pn-arm-benchmarks ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-omapconf ?= "1"
-SRCIPK_INSTALL_DIR_pn-omapconf ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-omapconf ?= "1"
+SRCIPK_INSTALL_DIR:pn-omapconf ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-pru-sw-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-pru-sw-examples ?= "example-applications/pru-${PV}"
+CREATE_SRCIPK:pn-ti-pru-sw-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-pru-sw-examples ?= "example-applications/pru-${PV}"
 
-CREATE_SRCIPK_pn-ti-ocf-crypto-module ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-ocf-crypto-module ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-ti-ocf-crypto-module ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-ocf-crypto-module ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-compat-wireless-wl18xx ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-compat-wireless-wl18xx ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-ti-compat-wireless-wl18xx ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-compat-wireless-wl18xx ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-wl18xx-fw ?= "1"
-SRCIPK_INSTALL_DIR_pn-wl18xx-fw ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-wl18xx-fw ?= "1"
+SRCIPK_INSTALL_DIR:pn-wl18xx-fw ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-wl1271-wlan-cli ?= "1"
-SRCIPK_INSTALL_DIR_pn-wl1271-wlan-cli ?= "example-applications/wlan"
+CREATE_SRCIPK:pn-wl1271-wlan-cli ?= "1"
+SRCIPK_INSTALL_DIR:pn-wl1271-wlan-cli ?= "example-applications/wlan"
 
-CREATE_SRCIPK_pn-av-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-av-examples ?= "example-applications/av-examples-${PV}"
+CREATE_SRCIPK:pn-av-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-av-examples ?= "example-applications/av-examples-${PV}"
 
-CREATE_SRCIPK_pn-u-boot ?= "1"
-SRCIPK_INSTALL_DIR_pn-u-boot ?= "board-support/u-boot-${PV}"
+CREATE_SRCIPK:pn-u-boot ?= "1"
+SRCIPK_INSTALL_DIR:pn-u-boot ?= "board-support/u-boot-${PV}"
 
-CREATE_SRCIPK_pn-u-boot-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR_pn-u-boot-ti-staging ?= "board-support/u-boot-${PV}${UBOOT_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT_pn-u-boot-ti-staging ?= "true"
+CREATE_SRCIPK:pn-u-boot-ti-staging ?= "1"
+SRCIPK_INSTALL_DIR:pn-u-boot-ti-staging ?= "board-support/u-boot-${PV}${UBOOT_LOCALVERSION}"
+SRCIPK_PRESERVE_GIT:pn-u-boot-ti-staging ?= "true"
 
-CREATE_SRCIPK_pn-u-boot-dra7xx ?= "1"
-SRCIPK_INSTALL_DIR_pn-u-boot-dra7xx ?= "board-support/u-boot-${PV}-${PR}"
+CREATE_SRCIPK:pn-u-boot-dra7xx ?= "1"
+SRCIPK_INSTALL_DIR:pn-u-boot-dra7xx ?= "board-support/u-boot-${PV}-${PR}"
 
-CREATE_SRCIPK_pn-trusted-firmware-a ?= "1"
-SRCIPK_INSTALL_DIR_pn-trusted-firmware-a ?= "board-support/${PN}-${PV}"
-SRCIPK_PRESERVE_GIT_pn-trusted-firmware-a ?= "true"
+CREATE_SRCIPK:pn-trusted-firmware-a ?= "1"
+SRCIPK_INSTALL_DIR:pn-trusted-firmware-a ?= "board-support/${PN}-${PV}"
+SRCIPK_PRESERVE_GIT:pn-trusted-firmware-a ?= "true"
 
-CREATE_SRCIPK_pn-linux-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT_pn-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_CLONE_pn-linux-ti-staging ?= "true"
+CREATE_SRCIPK:pn-linux-ti-staging ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
+SRCIPK_PRESERVE_GIT:pn-linux-ti-staging ?= "true"
+SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging ?= "true"
 
-CREATE_SRCIPK_pn-linux-ti-staging-rt ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-ti-staging-rt ?= "board-support/linux-rt-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT_pn-linux-ti-staging-rt ?= "true"
-SRCIPK_SHALLOW_CLONE_pn-linux-ti-staging-rt ?= "true"
+CREATE_SRCIPK:pn-linux-ti-staging-rt ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-ti-staging-rt ?= "board-support/linux-rt-${PV}${KERNEL_LOCALVERSION}"
+SRCIPK_PRESERVE_GIT:pn-linux-ti-staging-rt ?= "true"
+SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging-rt ?= "true"
 
-CREATE_SRCIPK_pn-linux-ti-staging-systest ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-ti-staging-systest ?= "board-support/linux-systest-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT_pn-linux-ti-staging-systest ?= "true"
-SRCIPK_SHALLOW_CLONE_pn-linux-ti-staging-systest ?= "true"
+CREATE_SRCIPK:pn-linux-ti-staging-systest ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-ti-staging-systest ?= "board-support/linux-systest-${PV}${KERNEL_LOCALVERSION}"
+SRCIPK_PRESERVE_GIT:pn-linux-ti-staging-systest ?= "true"
+SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging-systest ?= "true"
 
-CREATE_SRCIPK_pn-sitara-linux-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR_pn-sitara-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT_pn-sitara-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_CLONE_pn-sitara-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_DEPTH_pn-sitara-linux-ti-staging ?= "400"
+CREATE_SRCIPK:pn-sitara-linux-ti-staging ?= "1"
+SRCIPK_INSTALL_DIR:pn-sitara-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
+SRCIPK_PRESERVE_GIT:pn-sitara-linux-ti-staging ?= "true"
+SRCIPK_SHALLOW_CLONE:pn-sitara-linux-ti-staging ?= "true"
+SRCIPK_SHALLOW_DEPTH:pn-sitara-linux-ti-staging ?= "400"
 
-CREATE_SRCIPK_pn-linux-am335x-psp ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-am335x-psp ?= "board-support/linux-${KVER}"
+CREATE_SRCIPK:pn-linux-am335x-psp ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-am335x-psp ?= "board-support/linux-${KVER}"
 
-CREATE_SRCIPK_pn-linux-omap ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-omap ?= "board-support/linux-${PV}-${PR}"
+CREATE_SRCIPK:pn-linux-omap ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-omap ?= "board-support/linux-${PV}-${PR}"
 
-CREATE_SRCIPK_pn-linux ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux ?= "board-support/linux-${PV}"
+CREATE_SRCIPK:pn-linux ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux ?= "board-support/linux-${PV}"
 
-CREATE_SRCIPK_pn-linux-omap4 ?= "1"
-SRCIPK_INSTALL_DIR_pn-linux-omap4 ?= "board-support/linux-${PV}"
+CREATE_SRCIPK:pn-linux-omap4 ?= "1"
+SRCIPK_INSTALL_DIR:pn-linux-omap4 ?= "board-support/linux-${PV}"
 
-CREATE_SRCIPK_pn-cryptodev-module ?= "1"
-SRCIPK_INSTALL_DIR_pn-cryptodev-module ?= "board-support/extra-drivers/cryptodev-module-${PV}"
-SRCIPK_PRESERVE_GIT_pn-cryptodev-module ?= "true"
+CREATE_SRCIPK:pn-cryptodev-module ?= "1"
+SRCIPK_INSTALL_DIR:pn-cryptodev-module ?= "board-support/extra-drivers/cryptodev-module-${PV}"
+SRCIPK_PRESERVE_GIT:pn-cryptodev-module ?= "true"
 
-CREATE_SRCIPK_pn-cmem-mod ?= "1"
-SRCIPK_INSTALL_DIR_pn-cmem-mod ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-cmem-mod ?= "1"
+SRCIPK_INSTALL_DIR:pn-cmem-mod ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-debugss-module-drv ?= "1"
-SRCIPK_INSTALL_DIR_pn-debugss-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-debugss-module-drv ?= "1"
+SRCIPK_INSTALL_DIR:pn-debugss-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-gdbserverproxy-module-drv ?= "1"
-SRCIPK_INSTALL_DIR_pn-gdbserverproxy-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-gdbserverproxy-module-drv ?= "1"
+SRCIPK_INSTALL_DIR:pn-gdbserverproxy-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-sgx-ddk-km ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-sgx-ddk-km ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-ti-sgx-ddk-km ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-sgx-ddk-km ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-img-rogue-driver ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-img-rogue-driver ?= "board-support/extra-drivers/${PN}-${PV}"
-SRCIPK_PRESERVE_GIT_pn-ti-img-rogue-driver ?= "true"
+CREATE_SRCIPK:pn-ti-img-rogue-driver ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-img-rogue-driver ?= "board-support/extra-drivers/${PN}-${PV}"
+SRCIPK_PRESERVE_GIT:pn-ti-img-rogue-driver ?= "true"
 
-CREATE_SRCIPK_pn-ti-gc320-driver ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-gc320-driver ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-ti-gc320-driver ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-gc320-driver ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-ti-linux-driver-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-linux-driver-examples ?= "example-applications/linux-driver-examples-${PV}"
+CREATE_SRCIPK:pn-ti-linux-driver-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-linux-driver-examples ?= "example-applications/linux-driver-examples-${PV}"
 
-CREATE_SRCIPK_pn-ti-linux-driver-examples-omapl ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-linux-driver-examples-omapl ?= "example-applications/linux-driver-examples-${PV}"
+CREATE_SRCIPK:pn-ti-linux-driver-examples-omapl ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-linux-driver-examples-omapl ?= "example-applications/linux-driver-examples-${PV}"
 
-CREATE_SRCIPK_pn-ti-framework-components ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-framework-components ?= "component-sources/framework_components_${PV}"
+CREATE_SRCIPK:pn-ti-framework-components ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-framework-components ?= "component-sources/framework_components_${PV}"
 
-CREATE_SRCIPK_pn-ti-codec-engine ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codec-engine ?= "component-sources/codec_engine_${PV}"
+CREATE_SRCIPK:pn-ti-codec-engine ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codec-engine ?= "component-sources/codec_engine_${PV}"
 
-CREATE_SRCIPK_pn-ti-linuxutils ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-linuxutils ?= "component-sources/linuxutils_${PV}"
+CREATE_SRCIPK:pn-ti-linuxutils ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-linuxutils ?= "component-sources/linuxutils_${PV}"
 
-CREATE_SRCIPK_pn-ti-xdctools ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-xdctools ?= "component-sources/xdctools_${PV}"
+CREATE_SRCIPK:pn-ti-xdctools ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-xdctools ?= "component-sources/xdctools_${PV}"
 
-CREATE_SRCIPK_pn-ti-dmai ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dmai ?= "dmai_${PV}"
+CREATE_SRCIPK:pn-ti-dmai ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dmai ?= "dmai_${PV}"
 
-CREATE_SRCIPK_pn-ti-xdais ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-xdais ?= "component-sources/xdais_${PV}"
+CREATE_SRCIPK:pn-ti-xdais ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-xdais ?= "component-sources/xdais_${PV}"
 
-CREATE_SRCIPK_pn-ti-local-power-manager ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-local-power-manager ?= "local-power-manager_${PV}"
+CREATE_SRCIPK:pn-ti-local-power-manager ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-local-power-manager ?= "local-power-manager_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-dm355 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-dm355 ?= "codecs-dm355_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-dm355 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-dm355 ?= "codecs-dm355_${PV}"
 
-CREATE_SRCIPK_pn-ti-dvsdk-demos ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dvsdk-demos ?= "dvsdk-demos_${PV}"
+CREATE_SRCIPK:pn-ti-dvsdk-demos ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dvsdk-demos ?= "dvsdk-demos_${PV}"
 
-CREATE_SRCIPK_pn-ti-dvtb ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dvtb ?= "dvtb_${PV}"
+CREATE_SRCIPK:pn-ti-dvtb ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dvtb ?= "dvtb_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-dm365 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-dm365 ?= "codecs-dm365_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-dm365 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-dm365 ?= "codecs-dm365_${PV}"
 
-CREATE_SRCIPK_pn-ti-dm365mm-module ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dm365mm-module ?= "dm365mm-module_${PV}"
+CREATE_SRCIPK:pn-ti-dm365mm-module ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dm365mm-module ?= "dm365mm-module_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-dm6446 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-dm6446 ?= "codecs-dm6446_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-dm6446 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-dm6446 ?= "codecs-dm6446_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-dm6467 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-dm6467 ?= "codecs-dm6467_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-dm6467 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-dm6467 ?= "codecs-dm6467_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-omapl137 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-omapl137 ?= "codecs-omapl137_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-omapl137 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-omapl137 ?= "codecs-omapl137_${PV}"
 
-CREATE_SRCIPK_pn-ti-codecs-omapl138 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-codecs-omapl138 ?= "codecs-omapl138_${PV}"
+CREATE_SRCIPK:pn-ti-codecs-omapl138 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-codecs-omapl138 ?= "codecs-omapl138_${PV}"
 
-CREATE_SRCIPK_pn-ti-cgt6x ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-cgt6x ?= "dsp-devkit/cgt6x_${PV}"
+CREATE_SRCIPK:pn-ti-cgt6x ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-cgt6x ?= "dsp-devkit/cgt6x_${PV}"
 
-CREATE_SRCIPK_pn-ti-cgt470 ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-cgt470 ?= "media-controller-devkit/cgt470_${PV}"
+CREATE_SRCIPK:pn-ti-cgt470 ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-cgt470 ?= "media-controller-devkit/cgt470_${PV}"
 
-CREATE_SRCIPK_pn-ti-dspbios ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dspbios ?= "dspbios_${PV}"
+CREATE_SRCIPK:pn-ti-dspbios ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dspbios ?= "dspbios_${PV}"
 
-CREATE_SRCIPK_pn-ti-sysbios ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-sysbios ?= "component-sources/bios_${PV}"
+CREATE_SRCIPK:pn-ti-sysbios ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-sysbios ?= "component-sources/bios_${PV}"
 
-CREATE_SRCIPK_pn-ti-biosutils ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-biosutils ?= "biosutils_${PV}"
+CREATE_SRCIPK:pn-ti-biosutils ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-biosutils ?= "biosutils_${PV}"
 
-CREATE_SRCIPK_pn-ti-dsplink ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dsplink ?= "dsplink_${PV}"
+CREATE_SRCIPK:pn-ti-dsplink ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dsplink ?= "dsplink_${PV}"
 
-CREATE_SRCIPK_pn-ti-syslink ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-syslink ?= "component-sources/syslink_${PV}"
+CREATE_SRCIPK:pn-ti-syslink ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-syslink ?= "component-sources/syslink_${PV}"
 
-CREATE_SRCIPK_pn-ti-edma3lld ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-edma3lld ?= "component-sources/edma3lld_${PV}"
+CREATE_SRCIPK:pn-ti-edma3lld ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-edma3lld ?= "component-sources/edma3lld_${PV}"
 
-CREATE_SRCIPK_pn-ti-c6accel ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-c6accel ?= "component-sources/c6accel_${PV}"
+CREATE_SRCIPK:pn-ti-c6accel ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-c6accel ?= "component-sources/c6accel_${PV}"
 
-CREATE_SRCIPK_pn-ti-biospsp ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-biospsp ?= "biospsp_${PV}"
+CREATE_SRCIPK:pn-ti-biospsp ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-biospsp ?= "biospsp_${PV}"
 
-CREATE_SRCIPK_pn-ti-audio-soc-example ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-audio-soc-example ?= "audio-soc-example_${PV}"
+CREATE_SRCIPK:pn-ti-audio-soc-example ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-audio-soc-example ?= "audio-soc-example_${PV}"
 
-CREATE_SRCIPK_pn-ti-c6run ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-c6run ?= "component-sources/c6run_${PV}"
+CREATE_SRCIPK:pn-ti-c6run ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-c6run ?= "component-sources/c6run_${PV}"
 
-CREATE_SRCIPK_pn-ti-osal ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-osal ?= "component-sources/osal_${PV}"
+CREATE_SRCIPK:pn-ti-osal ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-osal ?= "component-sources/osal_${PV}"
 
-CREATE_SRCIPK_pn-ti-ipc ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-ipc ?= "component-sources/ipc_${PV}"
+CREATE_SRCIPK:pn-ti-ipc ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-ipc ?= "component-sources/ipc_${PV}"
 
-CREATE_SRCIPK_pn-ti-dsp-benchmark ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-dsp-benchmark ?= "example-applications/dsp-benchmark_${PV}"
+CREATE_SRCIPK:pn-ti-dsp-benchmark ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-dsp-benchmark ?= "example-applications/dsp-benchmark_${PV}"
 
-CREATE_SRCIPK_pn-gstreamer-ti ?= "1"
-SRCIPK_INSTALL_DIR_pn-gstreamer-ti ?= "gstreamer-ti_${PV}"
+CREATE_SRCIPK:pn-gstreamer-ti ?= "1"
+SRCIPK_INSTALL_DIR:pn-gstreamer-ti ?= "gstreamer-ti_${PV}"
 
-CREATE_SRCIPK_pn-ti-omx ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-omx ?= "component-sources/omx_${PV}"
+CREATE_SRCIPK:pn-ti-omx ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-omx ?= "component-sources/omx_${PV}"
 
-CREATE_SRCIPK_pn-ti-uia ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-uia ?= "component-sources/uia_${PV}"
+CREATE_SRCIPK:pn-ti-uia ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-uia ?= "component-sources/uia_${PV}"
 
-CREATE_SRCIPK_pn-ti-media-controller-utils ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-media-controller-utils ?= "board-support/media-controller-utils_${PV}"
+CREATE_SRCIPK:pn-ti-media-controller-utils ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-media-controller-utils ?= "board-support/media-controller-utils_${PV}"
 
-CREATE_SRCIPK_pn-ti-firmware-dm816x ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-firmware-dm816x ?= "board-support/prebuilt-images/dm816x-firmware_${PV}"
+CREATE_SRCIPK:pn-ti-firmware-dm816x ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-firmware-dm816x ?= "board-support/prebuilt-images/dm816x-firmware_${PV}"
 
-CREATE_SRCIPK_pn-ti-firmware-dm814x ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-firmware-dm814x ?= "board-support/prebuilt-images/dm814x-firmware_${PV}"
+CREATE_SRCIPK:pn-ti-firmware-dm814x ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-firmware-dm814x ?= "board-support/prebuilt-images/dm814x-firmware_${PV}"
 
-CREATE_SRCIPK_pn-ti-slog ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-slog ?= "component-sources/slog_${PV}"
+CREATE_SRCIPK:pn-ti-slog ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-slog ?= "component-sources/slog_${PV}"
 
-CREATE_SRCIPK_pn-ti-c674x-aaclcdec ?= "1"
-SRCIPK_INSTALL_DIR_pn-ti-c674x-aaclcdec ?= "component-sources/c674x-aaclcdec_${PV}"
+CREATE_SRCIPK:pn-ti-c674x-aaclcdec ?= "1"
+SRCIPK_INSTALL_DIR:pn-ti-c674x-aaclcdec ?= "component-sources/c674x-aaclcdec_${PV}"
 
-CREATE_SRCIPK_pn-oe-layersetup ?= "1"
-SRCIPK_INSTALL_DIR_pn-oe-layersetup ?= "bin/oe-layersetup"
+CREATE_SRCIPK:pn-oe-layersetup ?= "1"
+SRCIPK_INSTALL_DIR:pn-oe-layersetup ?= "bin/oe-layersetup"
 
-CREATE_SRCIPK_pn-opencl-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-opencl-examples ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-opencl-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-opencl-examples ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-openmpacc-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-openmpacc-examples ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-openmpacc-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-openmpacc-examples ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-tidl-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-tidl-examples ?= "example-applications/${PN}-${PV}"
-SRCIPK_SRC_DIR_pn-tidl-examples ?= "${S}/examples"
+CREATE_SRCIPK:pn-tidl-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-tidl-examples ?= "example-applications/${PN}-${PV}"
+SRCIPK_SRC_DIR:pn-tidl-examples ?= "${S}/examples"
 
-CREATE_SRCIPK_pn-qt-opencv-opencl-opengl-multithreaded ?= "1"
-SRCIPK_INSTALL_DIR_pn-qt-opencv-opencl-opengl-multithreaded ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-qt-opencv-opencl-opengl-multithreaded ?= "1"
+SRCIPK_INSTALL_DIR:pn-qt-opencv-opencl-opengl-multithreaded ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-libarch-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-libarch-examples ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-libarch-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-libarch-examples ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-linalg-examples ?= "1"
-SRCIPK_INSTALL_DIR_pn-linalg-examples ?= "example-applications/${PN}-${PV}"
-SRCIPK_SRC_DIR_pn-linalg-examples ?= "${EXAMPLES_ROOT}"
+CREATE_SRCIPK:pn-linalg-examples ?= "1"
+SRCIPK_INSTALL_DIR:pn-linalg-examples ?= "example-applications/${PN}-${PV}"
+SRCIPK_SRC_DIR:pn-linalg-examples ?= "${EXAMPLES_ROOT}"
 
-CREATE_SRCIPK_pn-barcode-roi ?= "1"
-SRCIPK_INSTALL_DIR_pn-barcode-roi ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-barcode-roi ?= "1"
+SRCIPK_INSTALL_DIR:pn-barcode-roi ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-boot-monitor ?= "1"
-SRCIPK_INSTALL_DIR_pn-boot-monitor ?= "board-support/${PN}-${PV}"
+CREATE_SRCIPK:pn-boot-monitor ?= "1"
+SRCIPK_INSTALL_DIR:pn-boot-monitor ?= "board-support/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-hplib-mod ?= "1"
-SRCIPK_INSTALL_DIR_pn-hplib-mod ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-hplib-mod ?= "1"
+SRCIPK_INSTALL_DIR:pn-hplib-mod ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-uio-module-drv ?= "1"
-SRCIPK_INSTALL_DIR_pn-uio-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK:pn-uio-module-drv ?= "1"
+SRCIPK_INSTALL_DIR:pn-uio-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-pru-icss ?= "1"
-SRCIPK_INSTALL_DIR_pn-pru-icss ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-pru-icss ?= "1"
+SRCIPK_INSTALL_DIR:pn-pru-icss ?= "example-applications/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-dsplib-c66x ?= "1"
-SRCIPK_INSTALL_DIR_pn-dsplib-c66x ?= "component-sources/dsplib_c66x_${PV}"
+CREATE_SRCIPK:pn-dsplib-c66x ?= "1"
+SRCIPK_INSTALL_DIR:pn-dsplib-c66x ?= "component-sources/dsplib_c66x_${PV}"
 
-CREATE_SRCIPK_pn-mathlib-c66x ?= "1"
-SRCIPK_INSTALL_DIR_pn-mathlib-c66x ?= "component-sources/mathlib_c66x_${PV}"
+CREATE_SRCIPK:pn-mathlib-c66x ?= "1"
+SRCIPK_INSTALL_DIR:pn-mathlib-c66x ?= "component-sources/mathlib_c66x_${PV}"
 
-CREATE_SRCIPK_pn-imglib-c66x ?= "1"
-SRCIPK_INSTALL_DIR_pn-imglib-c66x ?= "component-sources/imglib_c66x_${PV}"
+CREATE_SRCIPK:pn-imglib-c66x ?= "1"
+SRCIPK_INSTALL_DIR:pn-imglib-c66x ?= "component-sources/imglib_c66x_${PV}"
 
-CREATE_SRCIPK_pn-vlib-c66x ?= "1"
-SRCIPK_INSTALL_DIR_pn-vlib-c66x ?= "component-sources/vlib_c66x_${PV}"
+CREATE_SRCIPK:pn-vlib-c66x ?= "1"
+SRCIPK_INSTALL_DIR:pn-vlib-c66x ?= "component-sources/vlib_c66x_${PV}"
 
-CREATE_SRCIPK_pn-big-data-ipc-demo-linux ?= "1"
-SRCIPK_INSTALL_DIR_pn-big-data-ipc-demo-linux ?= "example-applications/${PN}-${PV}"
+CREATE_SRCIPK:pn-big-data-ipc-demo-linux ?= "1"
+SRCIPK_INSTALL_DIR:pn-big-data-ipc-demo-linux ?= "example-applications/${PN}-${PV}"
diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
index 6a4dd47b..96df5660 100644
--- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc
+++ b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
@@ -1,7 +1,7 @@
 ARAGO_TISDK_IMAGE = "arago-amsdk-image"
 
-PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "sitara-linux-ti-staging"
-PREFERRED_PROVIDER_virtual/kernel_am437x-evm = "sitara-linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel:am335x-evm = "sitara-linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel:am437x-evm = "sitara-linux-ti-staging"
 PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%"
 
 # To create newlines in the message \n is used and the slash must be escaped
@@ -24,8 +24,8 @@ script located in the sdk\'s bin directory\\n\
 The script may take several minutes but you will then have a full copy of\\n\
 the git repository including its entire git history.\\n"
 
-SRCIPK_CUSTOM_GIT_BRANCH_pn-sitara-linux-ti-staging = "amsdk-8.0"
-SRCIPK_CUSTOM_GIT_MESSAGE_pn-sitara-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
+SRCIPK_CUSTOM_GIT_BRANCH:pn-sitara-linux-ti-staging = "amsdk-8.0"
+SRCIPK_CUSTOM_GIT_MESSAGE:pn-sitara-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
 
-SRCIPK_CUSTOM_GIT_BRANCH_pn-u-boot-ti-staging = "amsdk-8.0"
-SRCIPK_CUSTOM_GIT_MESSAGE_pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
+SRCIPK_CUSTOM_GIT_BRANCH:pn-u-boot-ti-staging = "amsdk-8.0"
+SRCIPK_CUSTOM_GIT_MESSAGE:pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
diff --git a/meta-arago-distro/conf/distro/include/branding-bleeding.inc b/meta-arago-distro/conf/distro/include/branding-bleeding.inc
index 71b09f71..4054c5af 100644
--- a/meta-arago-distro/conf/distro/include/branding-bleeding.inc
+++ b/meta-arago-distro/conf/distro/include/branding-bleeding.inc
@@ -3,15 +3,15 @@
 require branding-core.inc
 
 # Auto rev important packages to pick up latest
-SRCREV_pn-linux-ti-staging = "${AUTOREV}"
-SRCREV_pn-linux-ti-staging-rt = "${AUTOREV}"
-SRCREV_pn-linux-ti-staging-systest = "${AUTOREV}"
-SRCREV_pn-u-boot-ti-staging = "${AUTOREV}"
-SRCREV_pn-ltp-ddt = "${AUTOREV}"
-#SRCREV_pn-optee-os = "${AUTOREV}"
-#SRCREV_pn-optee-client = "${AUTOREV}"
-#SRCREV_pn-optee-test = "${AUTOREV}"
-SRCREV_pn-arm-trusted-firmware = "${AUTOREV}"
+SRCREV:pn-linux-ti-staging = "${AUTOREV}"
+SRCREV:pn-linux-ti-staging-rt = "${AUTOREV}"
+SRCREV:pn-linux-ti-staging-systest = "${AUTOREV}"
+SRCREV:pn-u-boot-ti-staging = "${AUTOREV}"
+SRCREV:pn-ltp-ddt = "${AUTOREV}"
+#SRCREV:pn-optee-os = "${AUTOREV}"
+#SRCREV:pn-optee-client = "${AUTOREV}"
+#SRCREV:pn-optee-test = "${AUTOREV}"
+SRCREV:pn-arm-trusted-firmware = "${AUTOREV}"
 
 # Point to the latest ti linux firmware
 TI_LINUX_FW_SRCREV = "${AUTOREV}"
@@ -28,8 +28,8 @@ TI_RTOS_METADATA_BRANCH = "next"
 # Switch to internal nightlies, force overriding incorrect metadata values
 # and ensure parsing won't break w/o metadata file
 CORESDK_RTOS_WEBLINK_NIGHTLY ?= "file://empty"
-CORESDK_RTOS_WEBLINK_forcevariable = "${CORESDK_RTOS_WEBLINK_NIGHTLY}"
-CORESDK_RTOS_FIRMWARE_URL_forcevariable = "${DEFAULT_FIRMWARE_URL}"
+CORESDK_RTOS_WEBLINK:forcevariable = "${CORESDK_RTOS_WEBLINK_NIGHTLY}"
+CORESDK_RTOS_FIRMWARE_URL:forcevariable = "${DEFAULT_FIRMWARE_URL}"
 
 # Avoid use of old cached nightly file by using timed prefix
 DATEH := "${@time.strftime('%Y%m%d%H',time.gmtime())}"
@@ -37,4 +37,4 @@ CORESDK_RTOS_FILE_PREFIX = "${DATEH}-"
 CORESDK_RTOS_FILE_SUFFIX = ";downloadfilename=${CORESDK_RTOS_FILE_PREFIX}${DEFAULT_FIRMWARE_FILE}"
 
 # Build and assemble TI-SDK, but don't package it
-IMAGE_FSTYPES_pn-tisdk-core-bundle = ""
+IMAGE_FSTYPES:pn-tisdk-core-bundle = ""
diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc
index 3d259d2d..b28fb196 100644
--- a/meta-arago-distro/conf/distro/include/branding-core.inc
+++ b/meta-arago-distro/conf/distro/include/branding-core.inc
@@ -6,11 +6,11 @@
 # hence this file is mostly empty and used as a template
 
 # Lower opencl-monitor priority for now
-ALTERNATIVE_PRIORITY_pn-opencl-monitor = "1"
-ALTERNATIVE_PRIORITY_pn-opencl-monitor-ipu = "1"
+ALTERNATIVE_PRIORITY:pn-opencl-monitor = "1"
+ALTERNATIVE_PRIORITY:pn-opencl-monitor-ipu = "1"
 
 # Raise priority for sample IPC FW images
-ALTERNATIVE_PRIORITY_pn-ti-ipc-rtos = "15"
+ALTERNATIVE_PRIORITY:pn-ti-ipc-rtos = "15"
 
 # Remove mmip - DRM allocator, KMS sink, Wayland sink need porting to GST 1.18
-MACHINE_FEATURES_remove = "mmip"
+MACHINE_FEATURES:remove = "mmip"
diff --git a/meta-arago-distro/conf/distro/include/branding-glsdk.inc b/meta-arago-distro/conf/distro/include/branding-glsdk.inc
index 9a491038..0abd73cc 100644
--- a/meta-arago-distro/conf/distro/include/branding-glsdk.inc
+++ b/meta-arago-distro/conf/distro/include/branding-glsdk.inc
@@ -3,8 +3,8 @@
 # Use the SDK supported kernel and kernel version
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-glsdk"
 
-PREFERRED_PROVIDER_virtual/bootloader_omap-a15 = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot_omap-a15 = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader:omap-a15 = "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot:omap-a15 = "u-boot-ti-staging"
 
 # Set the PREFERRED_VERSION of libdrm to the glsdk version for the 
 # glsdk branded builds
diff --git a/meta-arago-distro/conf/distro/include/branding-mainline.inc b/meta-arago-distro/conf/distro/include/branding-mainline.inc
index 786508d9..2fc9dc5f 100644
--- a/meta-arago-distro/conf/distro/include/branding-mainline.inc
+++ b/meta-arago-distro/conf/distro/include/branding-mainline.inc
@@ -1,7 +1,7 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-mainline"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-mainline"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-mainline"
-SRCREV_ti-upstream-tools_pn-linux-ti-mainline = "${AUTOREV}"
+SRCREV_ti-upstream-tools:pn-linux-ti-mainline = "${AUTOREV}"
 
 # GPU support requires out-of-tree SGX and RGX drivers not available in mainline
-MACHINE_FEATURES_remove = "gpu"
+MACHINE_FEATURES:remove = "gpu"
diff --git a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
index 166e259a..25bb1b8c 100644
--- a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
+++ b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
@@ -2,8 +2,8 @@ ARAGO_TISDK_IMAGE = "processor-sdk-linux-image"
 
 # Set CMEM reserved memory region
 RESERVE_CMEM = "${@bb.utils.contains('MACHINE_FEATURES','dsp','1','0',d)}"
-CMEM_BASE_omap-a15 ?= "a0000000"
-CMEM_SIZE_omap-a15 ?= "08000000"
+CMEM_BASE:omap-a15 ?= "a0000000"
+CMEM_SIZE:omap-a15 ?= "08000000"
 
 # To create newlines in the message \n is used and the slash must be escaped
 # to function properly
@@ -25,10 +25,10 @@ script located in the sdk\'s bin directory\\n\
 The script may take several minutes but you will then have a full copy of\\n\
 the git repository including its entire git history.\\n"
 
-SRCIPK_CUSTOM_GIT_BRANCH_pn-linux-ti-staging = "processor-sdk-local"
-SRCIPK_CUSTOM_GIT_MESSAGE_pn-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
-SRCIPK_SHALLOW_CLONE_pn-linux-ti-staging = "true"
-SRCIPK_SHALLOW_DEPTH_pn-linux-ti-staging = "400"
+SRCIPK_CUSTOM_GIT_BRANCH:pn-linux-ti-staging = "processor-sdk-local"
+SRCIPK_CUSTOM_GIT_MESSAGE:pn-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
+SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging = "true"
+SRCIPK_SHALLOW_DEPTH:pn-linux-ti-staging = "400"
 
-SRCIPK_CUSTOM_GIT_BRANCH_pn-u-boot-ti-staging = "processor-sdk-local"
-SRCIPK_CUSTOM_GIT_MESSAGE_pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
+SRCIPK_CUSTOM_GIT_BRANCH:pn-u-boot-ti-staging = "processor-sdk-local"
+SRCIPK_CUSTOM_GIT_MESSAGE:pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc b/meta-arago-distro/conf/distro/include/toolchain-arm.inc
index e69536f9..9b76917d 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc
@@ -5,12 +5,12 @@ EAT_TARGET_SYS_ARMV5 ?= "arm-none-linux-gnueabi"
 EAT_TARGET_SYS_ARMV7 ?= "arm-none-linux-gnueabihf"
 EAT_TARGET_SYS_ARMV8 ?= "aarch64-none-linux-gnu"
 
-EAT_TARGET_SYS_arm = "${EAT_TARGET_SYS_ARMV5}"
-EAT_TARGET_SYS_armv7a = "${EAT_TARGET_SYS_ARMV7}"
-EAT_TARGET_SYS_aarch64 = "${EAT_TARGET_SYS_ARMV8}"
+EAT_TARGET_SYS:arm = "${EAT_TARGET_SYS_ARMV5}"
+EAT_TARGET_SYS:armv7a = "${EAT_TARGET_SYS_ARMV7}"
+EAT_TARGET_SYS:aarch64 = "${EAT_TARGET_SYS_ARMV8}"
 
 SECONDARY_TARGET_ARCH = "invalid"
-SECONDARY_TARGET_ARCH_k3 = "armv7a"
+SECONDARY_TARGET_ARCH:k3 = "armv7a"
 
 TARGET_VENDOR = ""
 
@@ -19,9 +19,9 @@ TOOLCHAIN_PATH_ARMV5 ?= "${TOOLCHAIN_BASE}/gcc-arm-9.2-ti2020.01-armv5-x86_64-${
 TOOLCHAIN_PATH_ARMV7 ?= "${TOOLCHAIN_BASE}/gcc-arm-9.2-2019.12-x86_64-${EAT_TARGET_SYS_ARMV7}"
 TOOLCHAIN_PATH_ARMV8 ?= "${TOOLCHAIN_BASE}/gcc-arm-9.2-2019.12-x86_64-${EAT_TARGET_SYS_ARMV8}"
 
-DEF_TOOLCHAIN_PATH_arm = "${TOOLCHAIN_PATH_ARMV5}"
-DEF_TOOLCHAIN_PATH_armv7a = "${TOOLCHAIN_PATH_ARMV7}"
-DEF_TOOLCHAIN_PATH_aarch64 = "${TOOLCHAIN_PATH_ARMV8}"
+DEF_TOOLCHAIN_PATH:arm = "${TOOLCHAIN_PATH_ARMV5}"
+DEF_TOOLCHAIN_PATH:armv7a = "${TOOLCHAIN_PATH_ARMV7}"
+DEF_TOOLCHAIN_PATH:aarch64 = "${TOOLCHAIN_PATH_ARMV8}"
 
 TOOLCHAIN_PATH ?= "${DEF_TOOLCHAIN_PATH}"
 
@@ -38,7 +38,7 @@ PREFERRED_PROVIDER_gcc-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-
 PREFERRED_PROVIDER_binutils-cross-canadian-${SECONDARY_TARGET_ARCH} ?= "external-arm-secondary-sdk-toolchain-${SECONDARY_TARGET_ARCH}"
 
 # Special case for gdb to be built as part of canadian-cross-sdk, instead of packaged from external toolchain
-bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${exec_prefix}/bin"
+bindir:pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${exec_prefix}/bin"
 PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 
 # Set up runtime preferences
diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf
index da0bb7ed..28d553ed 100644
--- a/meta-arago-distro/conf/layer.conf
+++ b/meta-arago-distro/conf/layer.conf
@@ -8,11 +8,12 @@ BBFILE_COLLECTIONS += "meta-arago-distro"
 BBFILE_PATTERN_meta-arago-distro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arago-distro = "10"
 
-LAYERSERIES_COMPAT_meta-arago-distro = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_meta-arago-distro = "honister"
 
 LAYERDEPENDS_meta-arago-distro = " \
     core \
-    meta-ti \
+    meta-ti-bsp \
+    meta-ti-extras \
     openembedded-layer \
     networking-layer \
     meta-python \
diff --git a/meta-arago-distro/conf/machine/arago-armv8.conf b/meta-arago-distro/conf/machine/arago-armv8.conf
index 7296347c..fd6147fe 100644
--- a/meta-arago-distro/conf/machine/arago-armv8.conf
+++ b/meta-arago-distro/conf/machine/arago-armv8.conf
@@ -18,4 +18,4 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 MACHINE_FEATURES = ""
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
 
-RDEPENDS_kernel-base = ""
+RDEPENDS:kernel-base = ""
diff --git a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend b/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
index e1600e8d..13ac6464 100644
--- a/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
+++ b/meta-arago-distro/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
@@ -1,8 +1,8 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-DEPENDS_remove = "virtual/libgl"
+DEPENDS:remove = "virtual/libgl"
 
 SRC_URI += "file://chromium-75.0.3770.80-SIOCGSTAMP.patch"
 SRC_URI += "file://pulse.patch"
diff --git a/meta-arago-distro/recipes-benchmark/arm-benchmarks/arm-benchmarks_%.bbappend b/meta-arago-distro/recipes-benchmark/arm-benchmarks/arm-benchmarks_%.bbappend
index e0b3ebe3..a281f4dd 100644
--- a/meta-arago-distro/recipes-benchmark/arm-benchmarks/arm-benchmarks_%.bbappend
+++ b/meta-arago-distro/recipes-benchmark/arm-benchmarks/arm-benchmarks_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 SRCIPK_SRC_DIR = "${S}/${PLATFORM_ARCH}"
diff --git a/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend b/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend
index 9cd8ce77..bf4b3ac9 100644
--- a/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend
+++ b/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 SRC_URI += "file://0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch"
 
diff --git a/meta-arago-distro/recipes-benchmark/stream/stream_%.bbappend b/meta-arago-distro/recipes-benchmark/stream/stream_%.bbappend
index 57c5d684..ac18074a 100644
--- a/meta-arago-distro/recipes-benchmark/stream/stream_%.bbappend
+++ b/meta-arago-distro/recipes-benchmark/stream/stream_%.bbappend
@@ -1,12 +1,12 @@
-INSANE_SKIP_${PN} += "ldflags"
-INSANE_SKIP_${PN}-openmp += "ldflags"
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN}-openmp += "ldflags"
 
-PR_append = ".arago1"
+PR:append = ".arago1"
 
 BRANCH = "sdk"
 SRCREV = "96156d407d9a4e5fac4513f3d3f60a414b3355cd"
 
-do_compile_prepend() {
+do_compile:prepend() {
     #Explicitly clear some variables to insure no unexpected optimizations are being passed in.
     unset CFLAGS
     unset LDFLAGS
diff --git a/meta-arago-distro/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-arago-distro/recipes-bsp/alsa-state/alsa-state.bbappend
index c5a35b7c..ef9c2f32 100644
--- a/meta-arago-distro/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-arago-distro/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
index 50dc369d..9759e688 100644
--- a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
+++ b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
@@ -16,9 +16,9 @@ INITSCRIPT_PARAMS = "defaults 99"
 
 inherit allarch update-rc.d systemd
 
-SYSTEMD_SERVICE_${PN} = "bt-enable.service"
+SYSTEMD_SERVICE:${PN} = "bt-enable.service"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
diff --git a/meta-arago-distro/recipes-connectivity/iproute2/iproute2_%.bbappend b/meta-arago-distro/recipes-connectivity/iproute2/iproute2_%.bbappend
index 78b78475..500071e4 100644
--- a/meta-arago-distro/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ b/meta-arago-distro/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -1,7 +1,7 @@
-PR_append = ".arago6"
+PR:append = ".arago6"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch \
 "
diff --git a/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend b/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend
index e4fb109a..06329b6e 100644
--- a/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend
+++ b/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 PV = "3.0+git${SRCPV}"
 
 BRANCH = "ti-linuxptp"
@@ -12,6 +12,6 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-do_install_append () {
+do_install:append () {
     install -p ${S}/phc2pwm ${D}/${bindir}
 }
diff --git a/meta-arago-distro/recipes-containers/docker/docker%.bbappend b/meta-arago-distro/recipes-containers/docker/docker%.bbappend
index ccf9ff2c..1d3c37ba 100644
--- a/meta-arago-distro/recipes-containers/docker/docker%.bbappend
+++ b/meta-arago-distro/recipes-containers/docker/docker%.bbappend
@@ -1,6 +1,6 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-do_install_append() {
+do_install:append() {
 	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
diff --git a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
index 6d89f46f..33aa31f7 100644
--- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
+++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
@@ -22,4 +22,4 @@ do_install(){
 	install -m0644 ${WORKDIR}/gplv3-notice.service ${D}${systemd_system_unitdir}
 }
 
-SYSTEMD_SERVICE_${PN} = "gplv3-notice.service"
+SYSTEMD_SERVICE:${PN} = "gplv3-notice.service"
diff --git a/meta-arago-distro/recipes-core/base-files/base-files_%.bbappend b/meta-arago-distro/recipes-core/base-files/base-files_%.bbappend
index c5f25f6a..e5c53e80 100644
--- a/meta-arago-distro/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-arago-distro/recipes-core/base-files/base-files_%.bbappend
@@ -1,4 +1,4 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago4"
+PR:append = ".arago4"
diff --git a/meta-arago-distro/recipes-core/busybox/busybox_%.bbappend b/meta-arago-distro/recipes-core/busybox/busybox_%.bbappend
index 42211792..9b440aa3 100644
--- a/meta-arago-distro/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-arago-distro/recipes-core/busybox/busybox_%.bbappend
@@ -1,6 +1,6 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://0001-rtcwake-Allow-poweroff-with-rtcwake-command.patch "
+SRC_URI:append = " file://0001-rtcwake-Allow-poweroff-with-rtcwake-command.patch "
 
-PR_append = ".arago21"
+PR:append = ".arago21"
diff --git a/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb b/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb
index 991fd2b8..ffc4d223 100644
--- a/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb
+++ b/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb
@@ -19,5 +19,5 @@ do_install() {
     install -m 0755 ${S}/udhcpd.conf ${D}${sysconfdir}
 }
 
-FILES_${PN} += "${sysconfdir}/udhcpd.conf"
-CONFFILES_${PN} += "${sysconfdir}/udhcpd.conf"
+FILES:${PN} += "${sysconfdir}/udhcpd.conf"
+CONFFILES:${PN} += "${sysconfdir}/udhcpd.conf"
diff --git a/meta-arago-distro/recipes-core/dbus/dbus_%.bbappend b/meta-arago-distro/recipes-core/dbus/dbus_%.bbappend
index 6e5d14cb..4bf6578a 100644
--- a/meta-arago-distro/recipes-core/dbus/dbus_%.bbappend
+++ b/meta-arago-distro/recipes-core/dbus/dbus_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago1"
+PR:append = ".arago1"
 
 LICENSE = "GPLv2+"
diff --git a/meta-arago-distro/recipes-core/feed-config/arago-feed-config_1.0.bb b/meta-arago-distro/recipes-core/feed-config/arago-feed-config_1.0.bb
index 7bf169b2..4239bc8f 100644
--- a/meta-arago-distro/recipes-core/feed-config/arago-feed-config_1.0.bb
+++ b/meta-arago-distro/recipes-core/feed-config/arago-feed-config_1.0.bb
@@ -37,7 +37,7 @@ do_install () {
 	install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
 }
 
-FILES_${PN} = "${sysconfdir}/opkg/"
+FILES:${PN} = "${sysconfdir}/opkg/"
 
-CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf \
+CONFFILES:${PN} += "${sysconfdir}/opkg/base-feeds.conf \
                     ${sysconfdir}/opkg/arch.conf"
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index e068287e..12446185 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "ti-soc"
 IMAGE_FEATURES += "package-management splash"
 
 # 4KB per 1 inode should be enough
-EXTRA_IMAGECMD_ext2.gz += "-i 4096"
+EXTRA_IMAGECMD:ext2.gz += "-i 4096"
 
 IMAGE_INSTALL = " \
 	packagegroup-core-boot \
diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
index 76668831..1f6928b1 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
@@ -4,7 +4,7 @@
 require arago-image.inc
 
 IMAGE_FSTYPES += "cpio.xz"
-IMAGE_FSTYPES_append_dra7xx = " ubifs ubi"
+IMAGE_FSTYPES:append:dra7xx = " ubifs ubi"
 
 IMAGE_INSTALL += "\
     packagegroup-arago-base \
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
index 636464b6..feff7842 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
@@ -1,14 +1,14 @@
 require tisdk-core-bundle.inc
 
-DEPLOY_SPL_NAME_omapl138 = ""
-DEPLOY_SPL_NAME_k3 = "tispl.bin tiboot3.bin"
+DEPLOY_SPL_NAME:omapl138 = ""
+DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
 
-DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin"
-DEPLOY_IMAGES_NAME_append_am65xx = " sysfw.itb"
-DEPLOY_IMAGES_NAME_append_j7-evm = " sysfw.itb"
-DEPLOY_IMAGES_NAME_append_j7-hs-evm = " sysfw.itb"
-DEPLOY_IMAGES_NAME_append_am65xx-evm = " ti-sci-firmware-am65x-gp.bin sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
-DEPLOY_IMAGES_NAME_append_j7-evm = " ti-fs-firmware-j721e-gp.bin"
+DEPLOY_IMAGES_NAME:k3 = "bl31.bin bl32.bin"
+DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:j7-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:j7-hs-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:am65xx-evm = " ti-sci-firmware-am65x-gp.bin sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
+DEPLOY_IMAGES_NAME:append:j7-evm = " ti-fs-firmware-j721e-gp.bin"
 
 ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
 export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
index 823402ad..cf4d0298 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
@@ -17,14 +17,14 @@ TOOLCHAIN_CLEANUP_PACKAGES = "libgnutls-dev libgnutls-extra26 libgnutls-openssl2
 # Set DTB filters for each machine.  Use "unknown" by default to avoid
 # picking up DTB files for devices with no DTB support.
 DTB_FILTER = "unknown"
-DTB_FILTER_ti33x = "am335x"
-DTB_FILTER_dra7xx-evm = "dra7"
-DTB_FILTER_am57xx-evm = "am57xx"
-DTB_FILTER_am57xx-hs-evm = "${DTB_FILTER_am57xx-evm}"
-DTB_FILTER_ti43x = "am43"
-DTB_FILTER_omapl138 = "da850"
-DTB_FILTER_am65xx = "am65"
-DTB_FILTER_j7 = "j721e"
+DTB_FILTER:ti33x = "am335x"
+DTB_FILTER:dra7xx-evm = "dra7"
+DTB_FILTER:am57xx-evm = "am57xx"
+DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}"
+DTB_FILTER:ti43x = "am43"
+DTB_FILTER:omapl138 = "da850"
+DTB_FILTER:am65xx = "am65"
+DTB_FILTER:j7 = "j721e"
 
 # List of target side images to build for the SDK
 TARGET_IMAGES = "tisdk-base-image tisdk-default-image"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index efac8d44..cd0f71b7 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -30,14 +30,14 @@ export IMAGE_BASENAME = "tisdk-default-image"
 
 # Disable ubi/ubifs as the filesystem requires more space than is
 # available on the HW.
-IMAGE_FSTYPES_remove_omapl138 = "ubifs ubi"
+IMAGE_FSTYPES:remove:omapl138 = "ubifs ubi"
 
 # Below is the delta in packages between old fuller and a new smaller default rootfs
 CHROMIUM = ""
-CHROMIUM_append_omap-a15 = "\
+CHROMIUM:append:omap-a15 = "\
     chromium-ozone-wayland \
 "
-CHROMIUM_append_k3 = "\
+CHROMIUM:append:k3 = "\
     chromium-ozone-wayland \
 "
 
diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
index c0ef8f24..a3db6ac2 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
@@ -2,7 +2,7 @@ ARAGO_SYSVINIT = "1"
 
 require arago-image.inc
 
-IMAGE_FEATURES_remove = "package-management splash"
+IMAGE_FEATURES:remove = "package-management splash"
 
 IMAGE_FSTYPES += "cpio cpio.xz"
 
diff --git a/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
index 129dd96a..d27bd7f0 100644
--- a/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ b/meta-arago-distro/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
@@ -1,4 +1,4 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago1"
+PR:append = ".arago1"
diff --git a/meta-arago-distro/recipes-core/meta/external-arm-toolchain.bbappend b/meta-arago-distro/recipes-core/meta/external-arm-toolchain.bbappend
index 5716ea13..ddf37ee2 100644
--- a/meta-arago-distro/recipes-core/meta/external-arm-toolchain.bbappend
+++ b/meta-arago-distro/recipes-core/meta/external-arm-toolchain.bbappend
@@ -10,8 +10,8 @@ KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH}"
 
-PKGV_linux-libc-headers-dev = "5.10"
-PKGV_linux-libc-headers = "5.10"
+PKGV:linux-libc-headers-dev = "5.10"
+PKGV:linux-libc-headers = "5.10"
 
 inherit kernel-arch pkgconfig multilib_header
 
@@ -19,12 +19,12 @@ EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
 
 DEPENDS += "bison-native rsync-native"
 
-do_configure_append() {
+do_configure:append() {
 	cd ${WORKDIR}/git
 	oe_runmake allnoconfig
 }
 
-do_install_append() {
+do_install:append() {
 	cd ${WORKDIR}/git
 	oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix}
 
diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.inc b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.inc
index be89feaa..e8d389c5 100644
--- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.inc
+++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.inc
@@ -3,6 +3,6 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "libgnutls-dev libgnutls-extra26 libgnutls-openssl
 
 INC_PR = "r5"
 
-toolchain_create_sdk_env_script_append() {
+toolchain_create_sdk_env_script:append() {
     echo -e 'export PS1="\[\\e[32;1m\][linux-devkit]\[\\e[0m\]:\w> "' >> $script
 }
diff --git a/meta-arago-distro/recipes-core/packagegroups/build-essential.bb b/meta-arago-distro/recipes-core/packagegroups/build-essential.bb
index c50053a2..5b9930b8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/build-essential.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/build-essential.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "packagegroup-core-buildessential"
+RDEPENDS:${PN} = "packagegroup-core-buildessential"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
index 0628b630..50122f11 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk-server-extra.bb
@@ -23,7 +23,7 @@ ARAGO_NDISC6 = "\
     ndisc6-tracert6 \
     "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${ARAGO_LIBNL} \
     ${ARAGO_NDISC6} \
     ptpd \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb
index e0d33bbb..a27a13ef 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb
@@ -11,7 +11,7 @@ OPTEE_PKGS = " \
     optee-test \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     dbus \
     expat \
     glib-2.0 \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
index 5b8bea7f..caa0bc01 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
@@ -40,7 +40,7 @@ ARAGO_EXTRA = "\
 "
 
 # minimal set of packages - needed to boot
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'alsa', '${ARAGO_ALSA_BASE}', '',d)} \
     ${ARAGO_BASE} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
index 619c6a18..cd2960c1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
@@ -75,10 +75,10 @@ ARAGO_CONSOLE = "\
     ${ARAGO_SDK_PREREQ} \
     "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${ARAGO_CONSOLE} \
     "
 
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS:${PN} = "\
     kernel-modules \
     "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
index 15323b0f..ef5624ec 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
@@ -18,11 +18,11 @@ GSTREAMER_DSP = " \
     ${@['','gstreamer1.0-plugins-dsp66-dev'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
 
-GSTREAMER_DEPS_append_dra7xx = " \
+GSTREAMER_DEPS:append:dra7xx = " \
     gstreamer1.0-plugins-hevc-dev \
     ${GSTREAMER_DSP} \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ${GSTREAMER_DEPS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
index e16b9878..65e315a1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
@@ -21,16 +21,16 @@ GSTREAMER_DSP = " \
     ${@['','gstreamer1.0-plugins-dsp66'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
 
-GSTREAMER_DEPS_append_dra7xx = " \
+GSTREAMER_DEPS:append:dra7xx = " \
     gstreamer1.0-plugins-hevc \
     ${GSTREAMER_DSP} \
 "
 
 GSTREAMER_ACCEL_MM = ""
-GSTREAMER_ACCEL_MM_omap-a15 = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', "gstreamer1.0-plugins-ducati", '', d)}"
-GSTREAMER_ACCEL_MM_append_dra7xx = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', " gstreamer1.0-plugins-vpe", '', d)}"
+GSTREAMER_ACCEL_MM:omap-a15 = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', "gstreamer1.0-plugins-ducati", '', d)}"
+GSTREAMER_ACCEL_MM:append:dra7xx = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', " gstreamer1.0-plugins-vpe", '', d)}"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${GSTREAMER_DEPS} \
     ${GSTREAMER_ACCEL_MM} \
     "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
index 091d728f..6604cca1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
@@ -4,7 +4,7 @@ PR = "r0"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     nano \
     mc \
     rsync \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index 3d69ba81..6dac7bfb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -6,7 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     qtbase-plugins \
     qtdeclarative-qmlplugins \
     qtlocation-plugins \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 366712e8..8d7cad24 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -14,63 +14,63 @@ UTILS = " \
 
 # ti-pru-sw-edma-driver is currently broken
 # Add pru and profibus sources for omapl138 devices
-#UTILS_append_omapl138 = " \
+#UTILS:append:omapl138 = " \
 #    ti-pru-sw-examples-source \
 #"
 
-UTILS_append_omap-a15 = " \
+UTILS:append:omap-a15 = " \
     omapconf-source \
     pru-icss-source \
 "
 
-UTILS_append_ti33x = " \
+UTILS:append:ti33x = " \
     omapconf-source \
     pru-icss-source \
 "
 
-UTILS_append_ti43x = " \
+UTILS:append:ti43x = " \
     pru-icss-source \
 "
 
-UTILS_append_k3 = " \
+UTILS:append:k3 = " \
     ti-sci-fw-source \
     trusted-firmware-a-source \
 "
 
-UTILS_append_j7-evm = " \
+UTILS:append:j7-evm = " \
     pru-icss-source \
 "
 
-UTILS_append_j7-hs-evm = " \
+UTILS:append:j7-hs-evm = " \
     pru-icss-source \
 "
 
-UTILS_append_am65xx = " \
+UTILS:append:am65xx = " \
     pru-icss-source \
 "
 
-UTILS_append_am64xx = " \
+UTILS:append:am64xx = " \
     pru-icss-src \
 "
 
 EXTRA_LIBS = ""
 
-EXTRA_LIBS_append_omap-a15 = " \
+EXTRA_LIBS:append:omap-a15 = " \
     cmem-mod-source \
     uio-module-drv-source \
     big-data-ipc-demo-linux-source \
 "
 
-#EXTRA_LIBS_append_dra7xx = " \
+#EXTRA_LIBS:append:dra7xx = " \
 #    debugss-module-drv-source \
 #    gdbserverproxy-module-drv-source \
 #"
 
-EXTRA_LIBS_append_ti33x = " \
+EXTRA_LIBS:append:ti33x = " \
     uio-module-drv-source \
 "
 
-EXTRA_LIBS_append_ti43x = " \
+EXTRA_LIBS:append:ti43x = " \
     cmem-mod-source \
     uio-module-drv-source \
 "
@@ -81,23 +81,23 @@ PDM_ANOMALY_PKG_SRC = "\
 
 EXTRA_PACKAGES = ""
 
-EXTRA_PACKAGES_append_omap-a15 = " \
+EXTRA_PACKAGES:append:omap-a15 = " \
     ${PDM_ANOMALY_PKG_SRC} \
 "
 
-EXTRA_PACKAGES_append_ti33x = " \
+EXTRA_PACKAGES:append:ti33x = " \
     ${PDM_ANOMALY_PKG_SRC} \
 "
 
-EXTRA_PACKAGES_append_ti43x = " \
+EXTRA_PACKAGES:append:ti43x = " \
     ${PDM_ANOMALY_PKG_SRC} \
 "
 
-EXTRA_PACKAGES_append_am65xx = " \
+EXTRA_PACKAGES:append:am65xx = " \
     ${PDM_ANOMALY_PKG_SRC} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${UTILS} \
     ${EXTRA_LIBS} \
     ${EXTRA_PACKAGES} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 2e2801aa..43a043e1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -13,25 +13,25 @@ UTILS = " \
 	python3-numpy \
 "
 
-UTILS_append_ti33x = " can-utils-dev"
-UTILS_append_ti43x = " can-utils-dev"
-UTILS_append_dra7xx = " can-utils-dev \
+UTILS:append:ti33x = " can-utils-dev"
+UTILS:append:ti43x = " can-utils-dev"
+UTILS:append:dra7xx = " can-utils-dev \
                         elfutils-dev \
                         elfutils-staticdev \
 "
-UTILS_append_k3 = "\
+UTILS:append:k3 = "\
 	can-utils-dev \
 	ti-rpmsg-char-dev \
 	ti-rpmsg-char-staticdev \
 "
 
 EXTRA_LIBS = ""
-EXTRA_LIBS_append_ti43x = "\
+EXTRA_LIBS:append:ti43x = "\
     cmem-dev \
     cmem-staticdev \
 "
-EXTRA_LIBS_append_omap-a15 = " cmem-dev"
-EXTRA_LIBS_append_dra7xx = " libulm-dev \
+EXTRA_LIBS:append:omap-a15 = " cmem-dev"
+EXTRA_LIBS:append:dra7xx = " libulm-dev \
                              libulm-staticdev \
                              gdbserver-c6x-dev \
 "
@@ -42,25 +42,25 @@ PDM_ANOMALY_PKG_DEV = "\
 
 
 EXTRA_PACKAGES = ""
-EXTRA_PACKAGES_append_ti33x = " \
+EXTRA_PACKAGES:append:ti33x = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
                                 ${PDM_ANOMALY_PKG_DEV} \
 "
-EXTRA_PACKAGES_append_ti43x = " \
+EXTRA_PACKAGES:append:ti43x = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
                                 ${PDM_ANOMALY_PKG_DEV} \
 "
-EXTRA_PACKAGES_append_omap-a15 = " \
+EXTRA_PACKAGES:append:omap-a15 = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
                                 ${PDM_ANOMALY_PKG_DEV} \
 "
-EXTRA_PACKAGES_append_am65xx = " arm-compute-library-dev \
+EXTRA_PACKAGES:append:am65xx = " arm-compute-library-dev \
                              tensorflow-lite-dev \
                              tensorflow-lite-staticdev \
                              ${PDM_ANOMALY_PKG_DEV} \
@@ -71,10 +71,10 @@ IPCDEV = " \
 	ti-ipc-staticdev \
 "
 
-EXTRA_PACKAGES_append_omap-a15 = " ${IPCDEV}"
-EXTRA_PACKAGES_append_omapl138 = " ${IPCDEV}"
+EXTRA_PACKAGES:append:omap-a15 = " ${IPCDEV}"
+EXTRA_PACKAGES:append:omapl138 = " ${IPCDEV}"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${UTILS} \
     ${EXTRA_LIBS} \
     ${EXTRA_PACKAGES} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 4e88072a..1c8b9467 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -31,7 +31,7 @@ UTILS_DSP = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'gdbc6x dsptop', '', d)} \
 "
 
-UTILS_append_ti33x = " mmc-utils \
+UTILS:append:ti33x = " mmc-utils \
                        switch-config \
                        pru-icss \
                        pru-swuart-fw \
@@ -39,7 +39,7 @@ UTILS_append_ti33x = " mmc-utils \
                        uio-test-pruss \
 "
 
-UTILS_append_ti43x = " mmc-utils \
+UTILS:append:ti43x = " mmc-utils \
                        switch-config \
                        libdrm-omap \
                        pru-icss \
@@ -47,7 +47,7 @@ UTILS_append_ti43x = " mmc-utils \
                        uio-test-pruss \
 "
 
-UTILS_append_omap-a15 = " mmc-utils \
+UTILS:append:omap-a15 = " mmc-utils \
                           switch-config \
                           libdrm-omap \
                           stream-openmp \
@@ -57,7 +57,7 @@ UTILS_append_omap-a15 = " mmc-utils \
                           uio-module-drv-test \
 "
 
-UTILS_append_k3 = " mmc-utils \
+UTILS:append:k3 = " mmc-utils \
                     switch-config \
                     irqbalance \
                     ti-rpmsg-char \
@@ -65,31 +65,31 @@ UTILS_append_k3 = " mmc-utils \
                     statcol \
 "
 
-UTILS_append_am64xx = " ti-rtos-firmware pru-icss"
-UTILS_append_am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
-UTILS_append_j7 = " ti-rtos-firmware"
-UTILS_append_j7-evm = " pru-icss"
-UTILS_append_j7-hs-evm = " pru-icss"
+UTILS:append:am64xx = " ti-rtos-firmware pru-icss"
+UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
+UTILS:append:j7 = " ti-rtos-firmware"
+UTILS:append:j7-evm = " pru-icss"
+UTILS:append:j7-hs-evm = " pru-icss"
 
-UTILS_append_omapl138 = " ti-ipc-rtos-fw"
+UTILS:append:omapl138 = " ti-ipc-rtos-fw"
 
-UTILS_append_dra7xx = " \
+UTILS:append:dra7xx = " \
                         ${UTILS_DSP} \
                         ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-example-apps','',d)} \
 "
 
 EXTRA_LIBS = ""
-EXTRA_LIBS_append_omap-a15 = " \
+EXTRA_LIBS:append:omap-a15 = " \
     cmem \
     uio-module-drv \
 "
 
-EXTRA_LIBS_append_ti43x = " \
+EXTRA_LIBS:append:ti43x = " \
     cmem \
     uio-module-drv \
 "
 
-EXTRA_LIBS_append_ti33x = " \
+EXTRA_LIBS:append:ti33x = " \
     uio-module-drv \
 "
 
@@ -100,29 +100,29 @@ EXTRA_PACKAGES = " \
     ccief-basic \
 "
 
-EXTRA_PACKAGES_omapl138 = " \
+EXTRA_PACKAGES:omapl138 = " \
     protobuf \
 "
 
-EXTRA_PACKAGES_append_omap-a15 = " ti-ipc-examples-linux"
-EXTRA_PACKAGES_append_omapl138 = " ti-ipc-examples-linux"
+EXTRA_PACKAGES:append:omap-a15 = " ti-ipc-examples-linux"
+EXTRA_PACKAGES:append:omapl138 = " ti-ipc-examples-linux"
 
-EXTRA_PACKAGES_append_omap-a15 = " \
+EXTRA_PACKAGES:append:omap-a15 = " \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','big-data-ipc-demo-linux big-data-ipc-demo-linux-firmware','',d)} \
 "
 
 # acontis-atemsys
-EXTRA_PACKAGES_append_am335x-evm = " pruss-lld-apps"
-EXTRA_PACKAGES_append_am437x-evm = " pruss-lld-apps"
+EXTRA_PACKAGES:append:am335x-evm = " pruss-lld-apps"
+EXTRA_PACKAGES:append:am437x-evm = " pruss-lld-apps"
 # acontis-atemsys
-EXTRA_PACKAGES_append_am57xx-evm = " pruss-lld-apps"
+EXTRA_PACKAGES:append:am57xx-evm = " pruss-lld-apps"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${UTILS} \
     ${UTILS_UBOOT_FW} \
     ${EXTRA_LIBS} \
 "
 
-RDEPENDS_${PN}-extra = "\
+RDEPENDS:${PN}-extra = "\
     ${EXTRA_PACKAGES} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
index 82d69403..bd27f0f1 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
@@ -13,14 +13,14 @@ UBOOT_SRC = "${PREFERRED_PROVIDER_virtual/bootloader}-source"
 KERNEL_SRC = "${PREFERRED_PROVIDER_virtual/kernel}-source"
 
 KERNEL_SHADOW_CLONE := "${PREFERRED_PROVIDER_virtual/kernel}"
-KERNEL_SHADOW_CLONE_ENABLED := "${SRCIPK_SHALLOW_CLONE_pn-${KERNEL_SHADOW_CLONE}}"
+KERNEL_SHADOW_CLONE_ENABLED := "${SRCIPK_SHALLOW_CLONE:pn-${KERNEL_SHADOW_CLONE}}"
 
 EXTRA_FILES = ""
-EXTRA_FILES_ti43x = "tisdk-uenv"
-EXTRA_FILES_omap-a15 = "tisdk-readme tisdk-uenv"
-EXTRA_FILES_k3 = "tisdk-readme tisdk-uenv"
+EXTRA_FILES:ti43x = "tisdk-uenv"
+EXTRA_FILES:omap-a15 = "tisdk-readme tisdk-uenv"
+EXTRA_FILES:k3 = "tisdk-readme tisdk-uenv"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ti-tisdk-setup \
     ${EXTRA_FILES} \
     ti-tisdk-makefile \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb
index c9a17c5e..4e913077 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb
@@ -9,14 +9,14 @@ inherit packagegroup
 # Out of Box Experience (OOBE)
 OOBE = ""
 
-OOBE_ti33x += "\
+OOBE:ti33x += "\
     parse-ip \
 "
 
-OOBE_ti43x += "\
+OOBE:ti43x += "\
     parse-ip \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${OOBE} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
index cdf6a623..7f5e9c2e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
@@ -12,16 +12,16 @@ BLUETOOTH_STACK = "\
 
 CONNECTIVITY_RDEPENDS = ""
 
-CONNECTIVITY_RDEPENDS_ti33x  = "\
+CONNECTIVITY_RDEPENDS:ti33x  = "\
     wpa-supplicant-dev \
     ${BLUETOOTH_STACK} \
 "
 
-CONNECTIVITY_RDEPENDS_ti43x  = "\
+CONNECTIVITY_RDEPENDS:ti43x  = "\
     wpa-supplicant-dev \
     ${BLUETOOTH_STACK} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${CONNECTIVITY_RDEPENDS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 50c4ea25..8798a44a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -65,6 +65,6 @@ CONNECTIVITY_RDEPENDS = " \
     ${BT_TI} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${CONNECTIVITY_RDEPENDS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
index 2dca54e1..2dad8bd7 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
@@ -8,11 +8,11 @@ inherit packagegroup
 
 CRYPTO_RDEPENDS = ""
 
-CRYPTO_RDEPENDS_append_ti33x = " cryptodev-module-source"
-CRYPTO_RDEPENDS_append_ti43x = " cryptodev-module-source"
-CRYPTO_RDEPENDS_append_dra7xx = " cryptodev-module-source"
-CRYPTO_RDEPENDS_append_k3 = " cryptodev-module-source"
+CRYPTO_RDEPENDS:append:ti33x = " cryptodev-module-source"
+CRYPTO_RDEPENDS:append:ti43x = " cryptodev-module-source"
+CRYPTO_RDEPENDS:append:dra7xx = " cryptodev-module-source"
+CRYPTO_RDEPENDS:append:k3 = " cryptodev-module-source"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${CRYPTO_RDEPENDS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
index 7df60f9f..01b20759 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-target.bb
@@ -7,11 +7,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 CRYPTO_API = ""
-CRYPTO_API_ti33x = "cryptodev-module-dev"
-CRYPTO_API_ti43x = "cryptodev-module-dev"
-CRYPTO_API_dra7xx = "cryptodev-module-dev"
+CRYPTO_API:ti33x = "cryptodev-module-dev"
+CRYPTO_API:ti43x = "cryptodev-module-dev"
+CRYPTO_API:dra7xx = "cryptodev-module-dev"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     openssl-dev \
     ${CRYPTO_API} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
index c2e6e68b..f217f7d8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
@@ -14,10 +14,10 @@ CRYPTO_SUPPORT = "\
 "
 
 #ti-crypto-examples
-CRYPTO_SUPPORT_append_ti33x = " cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_ti43x = " cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_dra7xx = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT:append:ti33x = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT:append:ti43x = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT:append:dra7xx = " cryptodev-module cryptodev-tests"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${CRYPTO_SUPPORT} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
index 683a9b6b..01ccd7d5 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
@@ -8,7 +8,7 @@ inherit packagegroup features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${PREFERRED_PROVIDER_virtual/gpudriver}-source \
     ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-driver-source', '', d)} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
index 0a2b8f64..093b2d3f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
@@ -8,7 +8,7 @@ inherit packagegroup features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     libegl-dev \
     libdrm-dev \
     wayland-dev \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 65b921cb..1d450600 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -14,11 +14,11 @@ GFX_WAYLAND = "\
 "
 
 GFX_UTILS = ""
-GFX_UTILS_append_omap-a15  = "\
+GFX_UTILS:append:omap-a15  = "\
     glsdk-util-scripts \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     libegl \
     glmark2 \
     ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-tests', '', d)} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb
index f45d6424..0bf3530d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk-sdk-target.bb
@@ -8,6 +8,6 @@ inherit packagegroup features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     gtk+3-dev \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
index 0d281c9d..59b0461d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
@@ -8,7 +8,7 @@ inherit packagegroup features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     gtk+3 \
     gtk+3-demo \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
index e327551e..2cd7ae6b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
@@ -10,28 +10,28 @@ REQUIRED_MACHINE_FEATURES = "gpu"
 
 HMI = ""
 
-HMI_append_ti43x = " \
+HMI:append:ti43x = " \
     evse-hmi-source \
     mmwavegesture-hmi-source \
 "
 
-HMI_append_ti33x = " \
+HMI:append:ti33x = " \
     evse-hmi-source \
     protection-relays-hmi-source \
     mmwavegesture-hmi-source \
 "
 
 
-HMI_append_omap-a15 = " \
+HMI:append:omap-a15 = " \
     evse-hmi-source \
     mmwavegesture-hmi-source \
 "
 
-HMI_append_am65xx = " \
+HMI:append:am65xx = " \
     evse-hmi-source \
     mmwavegesture-hmi-source \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${HMI} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
index 6958f08c..e16727c4 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
@@ -12,27 +12,27 @@ HMI = " \
 "
 
 
-HMI_append_ti33x = " \
+HMI:append:ti33x = " \
     evse-hmi \
     protection-relays-hmi \
     mmwavegesture-hmi \
 "
 
-HMI_append_ti43x = " \
+HMI:append:ti43x = " \
     evse-hmi \
     mmwavegesture-hmi \
 "
 
-HMI_append_omap-a15 = " \
+HMI:append:omap-a15 = " \
     evse-hmi \
     mmwavegesture-hmi \
 "
 
-HMI_append_am65xx = " \
+HMI:append:am65xx = " \
     evse-hmi \
     mmwavegesture-hmi \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
 	${HMI} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
index 83ffdfc4..c32966bb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
@@ -11,7 +11,7 @@ MATRIX_GUI = " \
     refresh-screen-source \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     matrix-gui-source \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GUI}",'',d)} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 7e2db8be..361bd04b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -35,27 +35,27 @@ MATRIX_QT_APPS = " \
     matrix-gui-thermostat-demo \
 "
 
-MATRIX_QT_APPS_append_omap-a15 = " \
+MATRIX_QT_APPS:append:omap-a15 = " \
     matrix-analytics-pdm-anomaly-detection \
     matrix-hmi-demo-evse            \
     matrix-hmi-demo-mmwavegesture   \
 "
 
-MATRIX_QT_APPS_append_am65xx = " \
+MATRIX_QT_APPS:append:am65xx = " \
     matrix-analytics-pdm-anomaly-detection \
                                     \
     matrix-hmi-demo-evse            \
     matrix-hmi-demo-mmwavegesture   \
 "
 
-MATRIX_QT_APPS_append_ti33x = " \
+MATRIX_QT_APPS:append:ti33x = " \
     matrix-analytics-pdm-anomaly-detection \
     matrix-hmi-demo-evse            \
     matrix-hmi-demo-protection-relays \
     matrix-hmi-demo-mmwavegesture   \
 "
 
-MATRIX_QT_APPS_append_ti43x = " \
+MATRIX_QT_APPS:append:ti43x = " \
     matrix-analytics-pdm-anomaly-detection \
     matrix-gui-apps-dual-camera     \
     matrix-gui-apps-image-gallery   \
@@ -76,7 +76,7 @@ MATRIX_GPU_DEMOS = " \
     matrix-3d-demo-kmscube \
 "
 
-MATRIX_GPU_DEMOS_append_omap-a15 = " \
+MATRIX_GPU_DEMOS:append:omap-a15 = " \
     matrix-3d-demo-kmscubevideo \
 "
 
@@ -85,7 +85,7 @@ MATRIX_OPENCL_APPS = " \
     matrix-opencl-demo-vecadd        \
 "
 
-MATRIX_OPENCL_APPS_append_dra7xx = " \
+MATRIX_OPENCL_APPS:append:dra7xx = " \
     matrix-video-analytics-opencv-opencl-opengl-demo \
     matrix-machinevision-demo-dlp3dscanner \
 "
@@ -99,14 +99,14 @@ MATRIX_OPENCV_OPENCL_APPS = " \
     matrix-machinevision-demo-barcoderoi-f2f \
 "
 
-MATRIX_OPENCV_OPENCL_APPS_omap-a15 = " \
+MATRIX_OPENCV_OPENCL_APPS:omap-a15 = " \
      matrix-machinevision-demo-barcoderoi \
      matrix-machinevision-demo-simplepeopletracking \
 "
 
 MATRIX_APPS = ""
 
-MATRIX_APPS_append_ti33x = "        \
+MATRIX_APPS:append:ti33x = "        \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h264dec  \
@@ -123,7 +123,7 @@ MATRIX_APPS_append_ti33x = "        \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
-MATRIX_APPS_append_ti43x = "        \
+MATRIX_APPS:append:ti43x = "        \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h264dec  \
@@ -138,7 +138,7 @@ MATRIX_APPS_append_ti43x = "        \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
-MATRIX_APPS_append_omap-a15 = "     \
+MATRIX_APPS:append:omap-a15 = "     \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h265dec  \
@@ -159,7 +159,7 @@ MATRIX_APPS_append_omap-a15 = "     \
 #                                \
 #
 
-MATRIX_APPS_append_am65xx = "           \
+MATRIX_APPS:append:am65xx = "           \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h264dec  \
@@ -169,7 +169,7 @@ MATRIX_APPS_append_am65xx = "           \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
-MATRIX_APPS_append_dra7xx += " \
+MATRIX_APPS:append:dra7xx = " \
     matrix-multimedia-demo-dsp66imgproc \
     matrix-tidl-demo-staticimg \
     matrix-tidl-demo-pnexamples \
@@ -183,7 +183,7 @@ MATRIX_APPS_append_dra7xx += " \
     matrix-tidl-demo-dogbreeds \
 "
 
-RDEPENDS_${PN} = "        \
+RDEPENDS:${PN} = "        \
     ${MATRIX_ESSENTIALS}  \
     ${MATRIX_APPS}        \
     ${MATRIX_COMMON_APPS} \
@@ -194,6 +194,6 @@ RDEPENDS_${PN} = "        \
     ${@['',"${MATRIX_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
 
-RDEPENDS_${PN}-extra = " \
+RDEPENDS:${PN}-extra = " \
     ${@['',"${MATRIX_OPENCV_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index b0de90cb..3169fd0a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -16,26 +16,26 @@ IMAGE_GALLERY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu','image-galle
 
 MULTIMEDIA = ""
 
-MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
+MULTIMEDIA:append:ti33x = " ${BARCODE_PKG}"
 
-MULTIMEDIA_append_ti43x = " \
+MULTIMEDIA:append:ti43x = " \
     ${DUAL_CAMERA_PKG} \
     ${IMAGE_GALLERY_PKG} \
     ${BARCODE_PKG} \
 "
 
-MULTIMEDIA_append_omap-a15 = " \
+MULTIMEDIA:append:omap-a15 = " \
     ${DUAL_CAMERA_PKG} \
     ${IMAGE_GALLERY_PKG} \
     ${BARCODE_PKG} \
 "
 
-MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
+MULTIMEDIA:append:am65xx = " ${BARCODE_PKG}"
 
-#MULTIMEDIA_append_dra7xx = " \
+#MULTIMEDIA:append:dra7xx = " \
 #    ${@['','qt-opencv-opencl-opengl-multithreaded-source'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
 #"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${MULTIMEDIA} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
index 24a313bc..62bcc0ea 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
@@ -14,17 +14,17 @@ BARCODE_PKG = ""
 MULTIMEDIA = ""
 
 #    ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]}
-MULTIMEDIA_append_dra7xx = " \
+MULTIMEDIA:append:dra7xx = " \
     hevc-arm-decoder-dev \
     hevc-arm-decoder-staticdev \
 "
 
-MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
-MULTIMEDIA_append_ti43x = " ${BARCODE_PKG}"
-MULTIMEDIA_append_omap-a15 = " ${BARCODE_PKG}"
-MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
+MULTIMEDIA:append:ti33x = " ${BARCODE_PKG}"
+MULTIMEDIA:append:ti43x = " ${BARCODE_PKG}"
+MULTIMEDIA:append:omap-a15 = " ${BARCODE_PKG}"
+MULTIMEDIA:append:am65xx = " ${BARCODE_PKG}"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${MULTIMEDIA} \
     packagegroup-arago-gst-sdk-target \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index e1ae4d9e..9d6767b0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -10,37 +10,37 @@ MULTIMEDIA = " \
     amsdk-av-files \
 "
 
-MULTIMEDIA_omapl138 = ""
+MULTIMEDIA:omapl138 = ""
 
 DUAL_CAMERA_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo', '', d)}"
 IMAGE_GALLERY_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'image-gallery', '', d)}"
 
-MULTIMEDIA_append_ti43x = " \
+MULTIMEDIA:append:ti43x = " \
     ${DUAL_CAMERA_DEMO} \
     ${IMAGE_GALLERY_DEMO} \
 "
 
-MULTIMEDIA_append_omap-a15 = " \
+MULTIMEDIA:append:omap-a15 = " \
     ${DUAL_CAMERA_DEMO} \
     ${IMAGE_GALLERY_DEMO} \
 "
 
-MULTIMEDIA_append_dra7xx = " \
+MULTIMEDIA:append:dra7xx = " \
     vis \
     hevc-arm-decoder \
 "
 
-MULTIMEDIA_append_omap5-evm = " \
+MULTIMEDIA:append:omap5-evm = " \
     abefw \
 "
 
 ACCEL_MM = ""
 
-ACCEL_MM_append_omap-a15 = " \
+ACCEL_MM:append:omap-a15 = " \
     ipumm-fw \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-arago-gst \
     ${MULTIMEDIA} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', '${ACCEL_MM}', '', d)} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
index 1e6baa20..ee5bb610 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
@@ -13,10 +13,10 @@ UTILS = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-examples-source')} \
 "
 
-UTILS_append_dra7xx = " \
+UTILS:append:dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples-source')} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${UTILS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
index 410bf47e..b660fcb4 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
@@ -13,10 +13,10 @@ UTILS = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-dev')} \
 "
 
-UTILS_append_dra7xx = " \
+UTILS:append:dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-dev')} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${UTILS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
index a36d794b..1aba3f7b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
@@ -18,14 +18,14 @@ EXTRA_PKGS = " \
 "
 
 #    ti-fftw-examples
-EXTRA_PKGS_append_dra7xx = " \
+EXTRA_PKGS:append:dra7xx = " \
     ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${MAIN_PKGS} \
 "
 
-RDEPENDS_${PN}-extra = "\
+RDEPENDS:${PN}-extra = "\
     ${EXTRA_PKGS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
index d3b55e85..538ec80a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
@@ -6,6 +6,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     qt-tstat-source \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index d1a9ae3c..60d6e63c 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -9,7 +9,7 @@ inherit packagegroup features_check
 REQUIRED_MACHINE_FEATURES = "gpu"
 
 #    qtdeclarative-examples
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-arago-qte \
     qtbase-examples \
     qtdeclarative-tools \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index 4f8ebbc9..c64e1727 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -15,9 +15,9 @@ TISDK_TOOLCHAIN_EXTRA_TARGET = "\
     packagegroup-arago-tisdk-connectivity-sdk-target \
     packagegroup-arago-tisdk-crypto-sdk-target \
 "
-TISDK_TOOLCHAIN_EXTRA_TARGET_omapl138 = ""
+TISDK_TOOLCHAIN_EXTRA_TARGET:omapl138 = ""
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-qte-toolchain-target','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk-sdk-target','',d)} \
     ${TISDK_TOOLCHAIN_BASE_TARGET} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
index 9f59ac8c..46df17f9 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
@@ -1,10 +1,10 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 SECONDARY_TARGET_ARCH ?= "invalid"
 
 SECONDARY_TOOLCHAIN = "gcc-cross-canadian-${SECONDARY_TARGET_ARCH} \
                        binutils-cross-canadian-${SECONDARY_TARGET_ARCH}"
 
-RDEPENDS_${PN}_append = " \
+RDEPENDS:${PN}:append = " \
     ${@oe.utils.conditional('SECONDARY_TARGET_ARCH', 'invalid', '', '${SECONDARY_TOOLCHAIN}', d)} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
index 05c88613..e16e4d51 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
@@ -9,7 +9,7 @@ TENSORFLOW_DEMO = ""
 #TENSORFLOW_DEMO = " \
 #    ${@oe.utils.all_distro_features(d, 'opencv', 'tensorflow-lite-demo', '')} \
 #"
-#TENSORFLOW_DEMO_dra7xx = " \
+#TENSORFLOW_DEMO:dra7xx = " \
 #    ${@['','tensorflow-lite-demo'][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
 
@@ -19,9 +19,9 @@ ANALYTICS = ""
 #    ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
 #    ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
-ANALYTICS_j7 = ""
-ANALYTICS_omapl138 = ""
+ANALYTICS:j7 = ""
+ANALYTICS:omapl138 = ""
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${ANALYTICS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
index 6141799f..3fbf4199 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
@@ -8,11 +8,11 @@ inherit packagegroup
 PDM_ANOMALY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection', '', d)}"
 
 PDM_ANOMALY = ""
-PDM_ANOMALY_ti33x = "${PDM_ANOMALY_PKG}"
-PDM_ANOMALY_ti43x = "${PDM_ANOMALY_PKG}"
-PDM_ANOMALY_omap-a15 = "${PDM_ANOMALY_PKG}"
-PDM_ANOMALY_am65xx = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY:ti33x = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY:ti43x = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY:omap-a15 = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY:am65xx = "${PDM_ANOMALY_PKG}"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${PDM_ANOMALY} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
index 20abf172..ecae271f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
@@ -8,5 +8,5 @@ inherit packagegroup
 
 PACKAGES += "${PN}-runtime"
 
-RDEPENDS_${PN} = "opencl"
-RDEPENDS_${PN}-runtime = "opencl-runtime"
+RDEPENDS:${PN} = "opencl"
+RDEPENDS:${PN}-runtime = "opencl-runtime"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index 008b30ce..bd307220 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -40,11 +40,11 @@ ARAGO_TEST = "\
     stream \
 "
 
-ARAGO_TEST_append_armv7a = " \
+ARAGO_TEST:append:armv7a = " \
     cpuburn-neon \
 "
 
-ARAGO_TEST_append_armv7ve = " \
+ARAGO_TEST:append:armv7ve = " \
     cpuburn-neon \
 "
 
@@ -57,18 +57,18 @@ ARAGO_TI_TEST = " \
     arm-benchmarks \
 "
 
-ARAGO_TI_TEST_append_ti33x = " \
+ARAGO_TI_TEST:append:ti33x = " \
     omapconf \
 "
 
-ARAGO_TI_TEST_append_ti43x = " \
+ARAGO_TI_TEST:append:ti43x = " \
     omapconf \
     ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'cmem-test', d)} \
 "
 
 NOT_MAINLINE_MMIP_DEPS = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'omapdrmtest', '', d)}"
 
-ARAGO_TI_TEST_append_omap-a15 = " \
+ARAGO_TI_TEST:append:omap-a15 = " \
     omapconf \
     ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', " \
         ti-ipc-test \
@@ -77,21 +77,21 @@ ARAGO_TI_TEST_append_omap-a15 = " \
     ", d)} \
 "
 
-ARAGO_TI_TEST_append_k3 = " \
+ARAGO_TI_TEST:append:k3 = " \
     k3conf \
 "
 
-ARAGO_TI_TEST_append_j7 = " \
+ARAGO_TI_TEST:append:j7 = " \
     ufs-utils \
     viddec-test-app \
     videnc-test-app \
 "
 
-ARAGO_TI_TEST_append_omapl138 = " \
+ARAGO_TI_TEST:append:omapl138 = " \
     ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti-ipc-test', d)} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     ${ARAGO_TEST} \
     ${ARAGO_TI_TEST} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 440e9e63..323d88ae 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -5,13 +5,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-INSANE_SKIP_${PN} += "dev-deps"
+INSANE_SKIP:${PN} += "dev-deps"
 
 CHROMIUM = ""
-CHROMIUM_append_omap-a15 = "\
+CHROMIUM:append:omap-a15 = "\
     chromium-ozone-wayland \
 "
-CHROMIUM_append_k3 = "\
+CHROMIUM:append:k3 = "\
     chromium-ozone-wayland \
 "
 
@@ -38,7 +38,7 @@ OPENCL = " \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-arago-base \
     packagegroup-arago-console \
     packagegroup-arago-base-tisdk \
diff --git a/meta-arago-distro/recipes-core/psplash/psplash_git.bbappend b/meta-arago-distro/recipes-core/psplash/psplash_git.bbappend
index 147e3eae..652c71f3 100644
--- a/meta-arago-distro/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-arago-distro/recipes-core/psplash/psplash_git.bbappend
@@ -1,7 +1,7 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago4"
+PR:append = ".arago4"
 
 #            file://0003-Updated-configurability.patch.patch
 SRC_URI += "file://psplash-18bpp.patch                      \
@@ -10,6 +10,6 @@ SRC_URI += "file://psplash-18bpp.patch                      \
             file://0001-psplash-Add-Arago-custom-color.patch\
 "
 
-do_configure_prepend() {
+do_configure:prepend() {
     install -m 0644 ${WORKDIR}/psplash-bar-img.h ${S}/
 }
diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
index 39fe64d4..9e49ac69 100644
--- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
@@ -1,12 +1,12 @@
-PR_append = ".arago6"
+PR:append = ".arago6"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG_append = " networkd resolved"
-USERADD_PARAM_${PN} += "--system -d / -M --shell /bin/nologin systemd-network;"
-USERADD_PARAM_${PN} += "--system -d / -M --shell /bin/nologin systemd-resolve;"
+PACKAGECONFIG:append = " networkd resolved"
+USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin systemd-network;"
+USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin systemd-resolve;"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://local.rules \
     file://usb1-rules.sh \
     file://usb2-rules.sh \
@@ -17,7 +17,7 @@ SRC_URI_append = " \
     file://sync-clocks.service \
 "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d/
     install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/
 
diff --git a/meta-arago-distro/recipes-core/sysvinit/sysvinit_%.bbappend b/meta-arago-distro/recipes-core/sysvinit/sysvinit_%.bbappend
index 6936e376..6f65b42d 100644
--- a/meta-arago-distro/recipes-core/sysvinit/sysvinit_%.bbappend
+++ b/meta-arago-distro/recipes-core/sysvinit/sysvinit_%.bbappend
@@ -1,10 +1,10 @@
-PR_append = ".arago1"
+PR:append = ".arago1"
 
 PACKAGES =+ "${PN}-initramfs"
 
-do_install_append() {
+do_install:append() {
 	[ ! -e ${D}/init ] && ln -s ${base_sbindir}/init ${D}/init
 }
 
-FILES_${PN}-initramfs = "/init"
-RDEPENDS_${PN}-initramfs = "${PN}"
+FILES:${PN}-initramfs = "/init"
+RDEPENDS:${PN}-initramfs = "${PN}"
diff --git a/meta-arago-distro/recipes-core/thermal-init/thermal-init.bb b/meta-arago-distro/recipes-core/thermal-init/thermal-init.bb
index f128c737..56f1ba1a 100644
--- a/meta-arago-distro/recipes-core/thermal-init/thermal-init.bb
+++ b/meta-arago-distro/recipes-core/thermal-init/thermal-init.bb
@@ -16,4 +16,4 @@ do_install() {
     install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }
 
-FILES_${PN} = "${sysconfdir} ${bindir}"
+FILES:${PN} = "${sysconfdir} ${bindir}"
diff --git a/meta-arago-distro/recipes-core/udev/eudev_%.bbappend b/meta-arago-distro/recipes-core/udev/eudev_%.bbappend
index 7d0a496d..4817e840 100644
--- a/meta-arago-distro/recipes-core/udev/eudev_%.bbappend
+++ b/meta-arago-distro/recipes-core/udev/eudev_%.bbappend
@@ -3,17 +3,17 @@
 # meta-arago switches to Dora
 
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago5"
+PR:append = ".arago5"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
                   file://usb1-rules.sh \
                   file://usb2-rules.sh"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${bindir}
 
     install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
diff --git a/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend
index a5f2d011..da36370f 100644
--- a/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend
+++ b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-FILES_${PN}-doc += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Help/"
+FILES:${PN}-doc += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Help/"
diff --git a/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend b/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend
index abd7a55a..9af89cbc 100644
--- a/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend
+++ b/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend
@@ -8,5 +8,5 @@ python() {
     if d.getVar('CLASSOVERRIDE') == "class-nativesdk":
         pkgs = d.getVar("PACKAGES").split()
         for p in pkgs:
-            d.appendVar('INSANE_SKIP_%s' % (p), ' shebang-size')
+            d.appendVar('INSANE_SKIP:%s' % (p), ' shebang-size')
 }
diff --git a/meta-arago-distro/recipes-devtools/php/php_%.bbappend b/meta-arago-distro/recipes-devtools/php/php_%.bbappend
index 79b95dc7..7db1f1cb 100644
--- a/meta-arago-distro/recipes-devtools/php/php_%.bbappend
+++ b/meta-arago-distro/recipes-devtools/php/php_%.bbappend
@@ -1,25 +1,25 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago1"
+PR:append = ".arago1"
 
-SRC_URI_append_virtclass-native = " file://0001-php-native-Fix-host-contamination-issue.patch"
+SRC_URI:append:virtclass-native = " file://0001-php-native-Fix-host-contamination-issue.patch"
 
 # Work around to address the fact that php-fpm and php-cgi can not coexist
 # php-cgi is used by Matrix and php-fpm is in beta for this version of php.
 # Once this issue is fix in meta-oe the below won't be needed.
 # Issue mentioned here: https://bugs.php.net/bug.php?id=60144
 
-EXTRA_OECONF_remove = "--enable-fpm"
+EXTRA_OECONF:remove = "--enable-fpm"
 
-PACKAGES_remove = "${PN}-fpm"
-PACKAGES_remove = "${PN}-fpm-apache2"
+PACKAGES:remove = "${PN}-fpm"
+PACKAGES:remove = "${PN}-fpm-apache2"
 
-do_install_prepend_pn-php() {
+do_install:prepend:pn-php() {
     # Add the below file even though we aren't going to use it.
     # do_install will complain and fail if this file isn't found.
     mkdir -p ${B}/sapi/fpm/
     touch ${B}/sapi/fpm/init.d.php-fpm
 }
 
-INSANE_SKIP_${PN} += "installed-vs-shipped"
+INSANE_SKIP:${PN} += "installed-vs-shipped"
diff --git a/meta-arago-distro/recipes-devtools/pm-qa/pm-qa_%.bbappend b/meta-arago-distro/recipes-devtools/pm-qa/pm-qa_%.bbappend
index 833d29ad..73d4013d 100644
--- a/meta-arago-distro/recipes-devtools/pm-qa/pm-qa_%.bbappend
+++ b/meta-arago-distro/recipes-devtools/pm-qa/pm-qa_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # Bump to 0.5.0+
 SRCREV = "e66966ef6a08cd3b491ee1df5c6c5d33baaf1f1c"
@@ -7,4 +7,4 @@ SRC_URI += " \
 	file://0001-Return-non-zero-value-on-test-failure.patch \
 	file://0002-cpuidle-Avoid-relative-paths.patch"
 
-PR_append = ".arago0"
+PR:append = ".arago0"
diff --git a/meta-arago-distro/recipes-devtools/python/python3_%.bbappend b/meta-arago-distro/recipes-devtools/python/python3_%.bbappend
index 3e5bb4c9..2afb2b37 100644
--- a/meta-arago-distro/recipes-devtools/python/python3_%.bbappend
+++ b/meta-arago-distro/recipes-devtools/python/python3_%.bbappend
@@ -8,5 +8,5 @@ python() {
     if d.getVar('CLASSOVERRIDE') == "class-nativesdk":
         pkgs = d.getVar("PACKAGES").split()
         for p in pkgs:
-            d.appendVar('INSANE_SKIP_%s' % (p), ' shebang-size')
+            d.appendVar('INSANE_SKIP:%s' % (p), ' shebang-size')
 }
diff --git a/meta-arago-distro/recipes-extended/bash/bash_%.bbappend b/meta-arago-distro/recipes-extended/bash/bash_%.bbappend
index 01e4c851..c837e5e3 100644
--- a/meta-arago-distro/recipes-extended/bash/bash_%.bbappend
+++ b/meta-arago-distro/recipes-extended/bash/bash_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 EXTRA_OECONF += " --disable-command-timing"
diff --git a/meta-arago-distro/recipes-extended/shadow/shadow-securetty_%.bbappend b/meta-arago-distro/recipes-extended/shadow/shadow-securetty_%.bbappend
index b8f981c2..62999d2a 100644
--- a/meta-arago-distro/recipes-extended/shadow/shadow-securetty_%.bbappend
+++ b/meta-arago-distro/recipes-extended/shadow/shadow-securetty_%.bbappend
@@ -1,6 +1,6 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-do_install_append () {
+do_install:append () {
     # Allow telnet sessions to login as root
     securetty_file=${D}${sysconfdir}/securetty
 
diff --git a/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend b/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend
index 6076f370..1de9aebb 100644
--- a/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-arago-distro/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago1"
+PR:append = ".arago1"
 
-PACKAGECONFIG_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'egl glesv2', '', d)}"
+PACKAGECONFIG:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'egl glesv2', '', d)}"
diff --git a/meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend b/meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend
index 99d2fa71..85152b5f 100644
--- a/meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend
+++ b/meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
 file://0001-Add-option-to-run-a-test-indefinitely.patch \
@@ -8,10 +8,10 @@ file://0001-libsync-add-support-for-pre-v4.7-kernels.patch \
 file://0002-Add-sync_fence_info-and-sync_pt_info.patch \
 "
 
-PR_append = ".arago3"
+PR:append = ".arago3"
 
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "10"
-ALTERNATIVE_${PN} = "kmstest"
+ALTERNATIVE:${PN} = "kmstest"
 ALTERNATIVE_LINK_NAME[kmstest] = "${bindir}/kmstest"
diff --git a/meta-arago-distro/recipes-graphics/freetype/freetype_%.bbappend b/meta-arago-distro/recipes-graphics/freetype/freetype_%.bbappend
index f99ac3c7..6018cca8 100644
--- a/meta-arago-distro/recipes-graphics/freetype/freetype_%.bbappend
+++ b/meta-arago-distro/recipes-graphics/freetype/freetype_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 LICENSE = "GPLv2+"
diff --git a/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
index 2d43a6b0..df1ca872 100644
--- a/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
+++ b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 
 SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04"
 
@@ -8,4 +8,4 @@ file://0001-meson-check-for-gles3-support.patch \
 
 CFLAGS += "-fcommon"
 
-PR_append = ".arago2"
+PR:append = ".arago2"
diff --git a/meta-arago-distro/recipes-graphics/tslib/tslib_%.bbappend b/meta-arago-distro/recipes-graphics/tslib/tslib_%.bbappend
index f9aec68f..74450a2a 100644
--- a/meta-arago-distro/recipes-graphics/tslib/tslib_%.bbappend
+++ b/meta-arago-distro/recipes-graphics/tslib/tslib_%.bbappend
@@ -1,4 +1,4 @@
 # look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-PR_append = ".arago1"
+PR:append = ".arago1"
diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb
index cd330f51..4626345e 100644
--- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb
+++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb
@@ -21,14 +21,14 @@ inherit cmake
 
 EXTRA_OECMAKE := "-DWITH_ILM_INPUT=1"
 
-FILES_${PN} += "${datadir}/wayland-protocols/stable/ivi-application/ivi-application.xml"
-FILES_${PN} += "${libdir}/weston/*"
-FILES_${PN}-dbg += "${libdir}/weston/.debug/*"
+FILES:${PN} += "${datadir}/wayland-protocols/stable/ivi-application/ivi-application.xml"
+FILES:${PN} += "${libdir}/weston/*"
+FILES:${PN}-dbg += "${libdir}/weston/.debug/*"
 
 EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
 PR = "r1"
 
 # Need these temporarily to prevent a non-fatal do_package_qa issue
-INSANE_SKIP_${PN} += "dev-deps"
-INSANE_SKIP_${PN}-dev += "dev-elf dev-so"
+INSANE_SKIP:${PN} += "dev-deps"
+INSANE_SKIP:${PN}-dev += "dev-elf dev-so"
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 55b191ef..15835c8f 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago10"
+PR:append = ".arago10"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://runWeston \
     file://wayland_env.sh \
     file://weston.ini \
 "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
 
@@ -17,4 +17,4 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/
 }
 
-FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini"
+FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini"
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_9.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_9.0.0.bbappend
index 006579bd..804507e3 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_9.0.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_9.0.0.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago3"
+PR:append = ".arago3"
 
 #        file://0002-weston-Allow-visual_id-to-be-0.patch
 SRC_URI += " \
diff --git a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
index f8a35cd7..74688f1c 100644
--- a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
@@ -1,3 +1,3 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 KERNEL_MODULE_AUTOLOAD += "cryptodev"
diff --git a/meta-arago-distro/recipes-kernel/kexec/kexec-tools_%.bbappend b/meta-arago-distro/recipes-kernel/kexec/kexec-tools_%.bbappend
index e66dcda1..88786124 100644
--- a/meta-arago-distro/recipes-kernel/kexec/kexec-tools_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/kexec/kexec-tools_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago2"
+PR:append = ".arago2"
 
-do_install_append() {
+do_install:append() {
 	chmod -x ${D}${sysconfdir}/init.d/kdump
 }
diff --git a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 3472f267..8742c7bf 100644
--- a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,17 +1,17 @@
-PR_append = ".arago1"
+PR:append = ".arago1"
 
 PACKAGES =+ "${PN}-iwlwifi-9260"
 PACKAGES =+ "${PN}-ibt-18"
 
-LICENSE_${PN}-iwlwifi-9260 = "Firmware-iwlwifi_firmware"
-LICENSE_${PN}-ibt-18 = "Firmware-ibt_firmware"
+LICENSE:${PN}-iwlwifi-9260 = "Firmware-iwlwifi_firmware"
+LICENSE:${PN}-ibt-18 = "Firmware-ibt_firmware"
 
-FILES_${PN}-iwlwifi-9260 = "${nonarch_base_libdir}/firmware/iwlwifi-9260-*.ucode"
-FILES_${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-18-*.ddc"
+FILES:${PN}-iwlwifi-9260 = "${nonarch_base_libdir}/firmware/iwlwifi-9260-*.ucode"
+FILES:${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-18-*.ddc"
 
-RDEPENDS_${PN}-iwlwifi-9260 += "${PN}-iwlwifi-license"
-RDEPENDS_${PN}-ibt-18 += "${PN}-ibt-license"
+RDEPENDS:${PN}-iwlwifi-9260 += "${PN}-iwlwifi-license"
+RDEPENDS:${PN}-ibt-18 += "${PN}-ibt-license"
 
-do_install_append() {
+do_install:append() {
 	rm -rf  ${D}/lib/firmware/ti-connectivity/
 }
diff --git a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
index 7f4343d7..4cd0ee1b 100644
--- a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
+++ b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
@@ -1,6 +1,6 @@
 require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
 
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
index 10ecf8ea..4347a88a 100644
--- a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
+++ b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
@@ -3,9 +3,9 @@ CONFIG_NAME ?= "tisdk_${MACHINE}${ARAGO_KERNEL_SUFFIX}_defconfig"
 # Copy the configuration file used during the SDK build in Arago to
 # the kernel sources to be packaged into the sourceipk.  Then call
 # the function to build the sourceipk again.  This is done as a
-# do_compile_prepend so that we can pick up any changes to the
+# do_compile:prepend so that we can pick up any changes to the
 # defconfig thay may have been done by the sanitizer code.
-do_configure_append() {
+do_configure:append() {
     cp ${B}/.config ${S}/arch/${ARCH}/configs/${CONFIG_NAME}
 
     # Remove defconfig generated by defconfig_builder to avoid confusion. This
diff --git a/meta-arago-distro/recipes-kernel/linux/docker.inc b/meta-arago-distro/recipes-kernel/linux/docker.inc
index 51eaf8d7..e926b219 100644
--- a/meta-arago-distro/recipes-kernel/linux/docker.inc
+++ b/meta-arago-distro/recipes-kernel/linux/docker.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://docker.cfg"
 KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/docker.cfg"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
index 165e86f3..402362c2 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
@@ -1,8 +1,8 @@
-MACHINE_KERNEL_PR_append = ".arago1"
+MACHINE_KERNEL_PR:append = ".arago1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 require copy-defconfig.inc
 require docker.inc
 
-ALLOW_EMPTY_kernel-devicetree = "1"
+ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
index 165e86f3..402362c2 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
@@ -1,8 +1,8 @@
-MACHINE_KERNEL_PR_append = ".arago1"
+MACHINE_KERNEL_PR:append = ".arago1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 require copy-defconfig.inc
 require docker.inc
 
-ALLOW_EMPTY_kernel-devicetree = "1"
+ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
index 31940e3f..f4fac19a 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
@@ -1,8 +1,8 @@
-MACHINE_KERNEL_PR_append = ".arago5"
+MACHINE_KERNEL_PR:append = ".arago5"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 require copy-defconfig.inc
 require docker.inc
 
-ALLOW_EMPTY_kernel-devicetree = "1"
+ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
index 8284e9dd..d2f22d8e 100644
--- a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
+++ b/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-PACKAGECONFIG_remove = "x264"
+PACKAGECONFIG:remove = "x264"
 LICENSE_FLAGS = ""
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend
index 5f6374af..4a4986c3 100644
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend
+++ b/meta-arago-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-%.bbappend
@@ -1,6 +1,6 @@
 # Remove all GFX PACKAGECONFIGs for platforms w/o GPU
-PACKAGECONFIG_remove = "${@bb.utils.contains('MACHINE_FEATURES','gpu','','x11 wayland gl egl gles2 qt5',d)}"
+PACKAGECONFIG:remove = "${@bb.utils.contains('MACHINE_FEATURES','gpu','','x11 wayland gl egl gles2 qt5',d)}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR_append = ".0"
+PR:append = ".0"
diff --git a/meta-arago-distro/recipes-multimedia/libtiff/tiff_%.bbappend b/meta-arago-distro/recipes-multimedia/libtiff/tiff_%.bbappend
index 2e0e4580..1bdc0802 100644
--- a/meta-arago-distro/recipes-multimedia/libtiff/tiff_%.bbappend
+++ b/meta-arago-distro/recipes-multimedia/libtiff/tiff_%.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 # Remove xz/lzma support to avoid pulling in additional GPLv3 licenses
-PACKAGECONFIG_remove = "lzma"
+PACKAGECONFIG:remove = "lzma"
diff --git a/meta-arago-distro/recipes-protocols/net-snmp/net-snmp_%.bbappend b/meta-arago-distro/recipes-protocols/net-snmp/net-snmp_%.bbappend
index 3772f116..32cbe416 100644
--- a/meta-arago-distro/recipes-protocols/net-snmp/net-snmp_%.bbappend
+++ b/meta-arago-distro/recipes-protocols/net-snmp/net-snmp_%.bbappend
@@ -1,8 +1,8 @@
-PR_append = ".arago7"
+PR:append = ".arago7"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-IEC-62439-3-add-initial-support-for-hsr-prp-mib-supp.patch \
     file://0002-IEC-62439-3-add-a-dummy-lreInterfaceConfigTable-for-.patch \
     file://0003-IEC-62439-3-MIB-update-lreInterfaceConfigTable-for-M.patch \
@@ -26,6 +26,6 @@ SRC_URI_append = " \
 PACKAGECONFIG[iec-62439-3-mib] = "--with-mib-modules=iec-62439-3-mib,,,"
 PACKAGECONFIG += "iec-62439-3-mib"
 
-RDEPENDS_${PN}-client += "perl-module-getopt-std \
+RDEPENDS:${PN}-client += "perl-module-getopt-std \
                           perl-module-term-readline \
 "
diff --git a/meta-arago-distro/recipes-qt/examples/qtwebbrowser_1.0.bbappend b/meta-arago-distro/recipes-qt/examples/qtwebbrowser_1.0.bbappend
index 3b7e80f6..1f61a3b8 100644
--- a/meta-arago-distro/recipes-qt/examples/qtwebbrowser_1.0.bbappend
+++ b/meta-arago-distro/recipes-qt/examples/qtwebbrowser_1.0.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
     file://0001-qtwebbrowser-disable-FullScreen-mode.patch \
 "
 
-PR_append = ".arago0"
+PR:append = ".arago0"
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
index 5c2974e1..63894c47 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
@@ -17,4 +17,4 @@ do_install () {
     install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
 }
 
-FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
+FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
index 21dc4f88..8ae8110b 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 GLES_EXTRA_DEPS = "libdrm wayland"
 
 PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
 
-PR_append = ".arago17"
+PR:append = ".arago17"
 
 QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
 
@@ -23,7 +23,7 @@ SRC_URI += "\
     file://0001-eglfs-Force-888-format-only-on-env-flag.patch \
 "
 
-python do_patch_append() {
+python do_patch:append() {
     import shutil
 
     work_dir = d.getVar("WORKDIR")
@@ -34,13 +34,13 @@ python do_patch_append() {
 }
 
 # Add symbolic link qt5/examples for backward compatibility
-do_install_append () {
+do_install:append () {
 
     install -d ${D}${datadir}/qt5
     ln -sf ../examples ${D}${datadir}/qt5/examples
 }
 
-FILES_${PN}-examples +=  "${datadir}/qt5/*"
+FILES:${PN}-examples +=  "${datadir}/qt5/*"
 
 
-RDEPENDS_${PN} += "${PN}-conf"
+RDEPENDS:${PN} += "${PN}-conf"
diff --git a/meta-arago-distro/recipes-qt/qt5/qtdeclarative_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
index e1408c71..4167ac43 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = ".tisdk1"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PR:append = ".tisdk1"
 
-CXXFLAGS_append_omap-a15 = " -DQ_OS_BLACKBERRY"
+CXXFLAGS:append:omap-a15 = " -DQ_OS_BLACKBERRY"
 
 
 SRC_URI += " \
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
index c602813c..23a2f907 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = ".arago2"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PR:append = ".arago2"
 
 SRC_URI += " \
     file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebengine_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebengine_git.bbappend
index 6459bbf7..60f6678f 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = ".arago1"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PR:append = ".arago1"
 
 DEPENDS += "bison-native"
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
index 1dbe40d1..22d2dc70 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 #	file://GraphicsSurfaceToken.h.patch
 #	file://0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
@@ -9,10 +9,10 @@ SRC_URI += " \
 	file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
 "
 
-PR_append = ".arago8"
+PR:append = ".arago8"
 
-EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
+EXTRA_OECMAKE:append = " -DCMAKE_BUILD_TYPE=Release"
 
-EXTRA_OECMAKE_append_k3 = " -DUSE_SYSTEM_MALLOC=ON"
+EXTRA_OECMAKE:append:k3 = " -DUSE_SYSTEM_MALLOC=ON"
 
 DEPENDS += "flex-native bison-native"
diff --git a/meta-arago-distro/recipes-support/gnutls/gnutls_%.bbappend b/meta-arago-distro/recipes-support/gnutls/gnutls_%.bbappend
index 456982c7..7928a810 100644
--- a/meta-arago-distro/recipes-support/gnutls/gnutls_%.bbappend
+++ b/meta-arago-distro/recipes-support/gnutls/gnutls_%.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 # Set INCOMPATIBLE_LICENSE to GPLv3 to allow gnutls to use the non GPLv2
 # version of gettext.
diff --git a/meta-arago-distro/recipes-support/libnl/libnl_3.5.0.bbappend b/meta-arago-distro/recipes-support/libnl/libnl_3.5.0.bbappend
index db716ccf..523335c4 100644
--- a/meta-arago-distro/recipes-support/libnl/libnl_3.5.0.bbappend
+++ b/meta-arago-distro/recipes-support/libnl/libnl_3.5.0.bbappend
@@ -1,6 +1,6 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-do_install_append() {
+do_install:append() {
 #   Install private files to allow libnl extensions
     install -d ${D}${includedir}/netlink-private
     cp -r ${S}/include/netlink-private/cache-api.h ${D}${includedir}/netlink-private/
diff --git a/meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
index 2a7810f7..975e2535 100644
--- a/meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 SRC_URI += "file://rngd.rules"
 
-do_install_append() {
+do_install:append() {
 	# remove duplicate initscript
 	rm -f ${D}${sysconfdir}/init.d/rng-tools
 
diff --git a/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend b/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
index c3d4b573..0af8c9c2 100644
--- a/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
+++ b/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
@@ -1,5 +1,5 @@
-PR_append = ".arago4"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+PR:append = ".arago4"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 PACKAGECONFIG = "charon curl openssl stroke sqlite3 \
         ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \
@@ -12,6 +12,6 @@ EXTRA_OECONF += " \
 
 SRC_URI += "file://pkcs11_plugin.conf"
 
-do_install_append () {
+do_install:append () {
 	install -m 0644 ${WORKDIR}/pkcs11_plugin.conf ${D}${sysconfdir}/strongswan.d/
 }
diff --git a/meta-arago-distro/recipes-support/syslog-ng/syslog-ng_%.bbappend b/meta-arago-distro/recipes-support/syslog-ng/syslog-ng_%.bbappend
index 931a1d98..6c6a8ff0 100644
--- a/meta-arago-distro/recipes-support/syslog-ng/syslog-ng_%.bbappend
+++ b/meta-arago-distro/recipes-support/syslog-ng/syslog-ng_%.bbappend
@@ -1,2 +1,2 @@
-PR_append = ".arago0"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+PR:append = ".arago0"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
diff --git a/meta-arago-distro/recipes-tisdk/ocl-rtos/opencl-examples-rtos_git.bbappend b/meta-arago-distro/recipes-tisdk/ocl-rtos/opencl-examples-rtos_git.bbappend
index 831aba04..a0e3d084 100644
--- a/meta-arago-distro/recipes-tisdk/ocl-rtos/opencl-examples-rtos_git.bbappend
+++ b/meta-arago-distro/recipes-tisdk/ocl-rtos/opencl-examples-rtos_git.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
 CM_NAME = "OpenCL"
 CM_VERSION = "${PV}"
diff --git a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
index ac03ea43..85cf2554 100644
--- a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
+++ b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
@@ -21,4 +21,4 @@ do_install() {
     install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/parse-ip
 }
 
-FILES_${PN} = "${sysconfdir}"
+FILES:${PN} = "${sysconfdir}"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 6937ced1..c8b19d58 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -61,8 +61,8 @@ MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         qt-tstat \
 "
 
-MAKEFILES_MATRIX_GUI_omapl138 = ""
-MAKEFILES_MATRIX_GUI_j7 = ""
+MAKEFILES_MATRIX_GUI:omapl138 = ""
+MAKEFILES_MATRIX_GUI:j7 = ""
 
 MAKEFILES_COMMON = "linux \
                     matrix-gui \
@@ -75,7 +75,7 @@ MAKEFILES = ""
 
 # Add device specific make targets
 
-MAKEFILES_append_ti33x = " u-boot-spl \
+MAKEFILES:append:ti33x = " u-boot-spl \
                            ti-crypto-examples \
                            linux-dtbs \
                            cryptodev \
@@ -85,7 +85,7 @@ MAKEFILES_append_ti33x = " u-boot-spl \
 			   mmwavegesture-hmi \
                            pdm-anomaly-detection \
 "
-MAKEFILES_append_ti43x = " u-boot-spl \
+MAKEFILES:append:ti43x = " u-boot-spl \
                            ti-crypto-examples \
                            linux-dtbs \
                            cryptodev \
@@ -101,7 +101,7 @@ MAKEFILES_append_ti43x = " u-boot-spl \
 
 #                            debugss-module-drv 
 #                            gdbserverproxy-module-drv 
-MAKEFILES_append_dra7xx = " cryptodev \
+MAKEFILES:append:dra7xx = " cryptodev \
                             opencl-examples \
                             openmpacc-examples \
                             qt-opencv-opencl-opengl-multithreaded \
@@ -109,7 +109,7 @@ MAKEFILES_append_dra7xx = " cryptodev \
                             tiovx-app-host \
 "
 
-MAKEFILES_append_omap-a15 = " u-boot-spl \
+MAKEFILES:append:omap-a15 = " u-boot-spl \
                               omapconf \
                               linux-dtbs \
                               ti-sgx-ddk-km \
@@ -122,19 +122,19 @@ MAKEFILES_append_omap-a15 = " u-boot-spl \
                               pdm-anomaly-detection \
                               ti-ipc \
 "
-MAKEFILES_append_omapl138 = " linux-dtbs \
+MAKEFILES:append:omapl138 = " linux-dtbs \
                               u-boot-spl \
                               ti-ipc \
 "
 
-MAKEFILES_append_k3 = " u-boot-spl \
+MAKEFILES:append:k3 = " u-boot-spl \
                         linux-dtbs \
                         cryptodev \
                         sysfw-image \
                         ti-ipc \
 "
 
-MAKEFILES_append_am65xx = " \
+MAKEFILES:append:am65xx = " \
                         pru-icss \
                         ti-sgx-ddk-km \
                         barcode-roi \
@@ -142,10 +142,10 @@ MAKEFILES_append_am65xx = " \
                         pdm-anomaly-detection \
 "
 
-MAKEFILES_append_j7 = " pru-icss \
+MAKEFILES:append:j7 = " pru-icss \
                             ti-img-rogue-driver \
 "
-MAKEFILES_append_am64xx = " \
+MAKEFILES:append:am64xx = " \
                         pru-icss \
 "
 
@@ -157,32 +157,32 @@ inherit kernel-arch
 
 # Use ARCH format expected by the makefile
 PLATFORM_ARCH = "${ARMPKGARCH}"
-PLATFORM_ARCH_arm = "armv7-a"
-PLATFORM_ARCH_omapl138 = "armv5te"
+PLATFORM_ARCH:arm = "armv7-a"
+PLATFORM_ARCH:omapl138 = "armv5te"
 
 # ti-sgx-ddk-km configurations
 # See meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
 TI_SGX_TARGET_PRODUCT = "jacinto6evm"
-TI_SGX_TARGET_PRODUCT_ti33x = "ti335x"
-TI_SGX_TARGET_PRODUCT_ti43x = "ti437x"
-TI_SGX_TARGET_PRODUCT_k3 = "ti654x"
+TI_SGX_TARGET_PRODUCT:ti33x = "ti335x"
+TI_SGX_TARGET_PRODUCT:ti43x = "ti437x"
+TI_SGX_TARGET_PRODUCT:k3 = "ti654x"
 
 TI_SGX_TARGET_ARCH = "armhf"
-TI_SGX_TARGET_ARCH_k3 = "aarch64"
+TI_SGX_TARGET_ARCH:k3 = "aarch64"
 
 PLATFORM_DEBUGSS = ""
-PLATFORM_DEBUGSS_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_DEBUGSS:dra7xx = "DRA7xx_PLATFORM"
 
 PLATFORM_GDBSERVERPROXY = ""
-PLATFORM_GDBSERVERPROXY_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_GDBSERVERPROXY:dra7xx = "DRA7xx_PLATFORM"
 
 PRU_ICSS_INSTALL_TARGET = "pru-icss_install_none"
-PRU_ICSS_INSTALL_TARGET_ti33x = "pru-icss_install_am335x"
-PRU_ICSS_INSTALL_TARGET_ti43x = "pru-icss_install_am437x"
-PRU_ICSS_INSTALL_TARGET_omap-a15 = "pru-icss_install_am572x"
-PRU_ICSS_INSTALL_TARGET_am65xx = "pru-icss_install_am65x"
-PRU_ICSS_INSTALL_TARGET_j7 = "pru-icss_install_j721e"
-PRU_ICSS_INSTALL_TARGET_am64xx = "pru-icss_install_am64x"
+PRU_ICSS_INSTALL_TARGET:ti33x = "pru-icss_install_am335x"
+PRU_ICSS_INSTALL_TARGET:ti43x = "pru-icss_install_am437x"
+PRU_ICSS_INSTALL_TARGET:omap-a15 = "pru-icss_install_am572x"
+PRU_ICSS_INSTALL_TARGET:am65xx = "pru-icss_install_am65x"
+PRU_ICSS_INSTALL_TARGET:j7 = "pru-icss_install_j721e"
+PRU_ICSS_INSTALL_TARGET:am64xx = "pru-icss_install_am64x"
 
 # Path to toolchains for the various cores in TI SOCs
 #
@@ -194,9 +194,9 @@ IPC_TOOLS_PATHS_R5F  = "ti.targets.arm.elf.R5F="\$\(TOOLCHAIN_PATH_R5\)""
 IPC_TOOLS_PATHS_C674 = "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
 
 IPC_TOOLS_PATHS = ""
-IPC_TOOLS_PATHS_append_omap-a15 = " ${IPC_TOOLS_PATHS_C66} ${IPC_TOOLS_PATHS_M4}"
-IPC_TOOLS_PATHS_append_omapl138 = " ${IPC_TOOLS_PATHS_C674}"
-IPC_TOOLS_PATHS_append_k3 = "${IPC_TOOLS_PATHS_R5F}"
+IPC_TOOLS_PATHS:append:omap-a15 = " ${IPC_TOOLS_PATHS_C66} ${IPC_TOOLS_PATHS_M4}"
+IPC_TOOLS_PATHS:append:omapl138 = " ${IPC_TOOLS_PATHS_C674}"
+IPC_TOOLS_PATHS:append:k3 = "${IPC_TOOLS_PATHS_R5F}"
 
 # If it's not defined at all, like for zImage case
 UBOOT_LOADADDRESS ?= "0"
@@ -298,12 +298,12 @@ do_install () {
 }
 
 K3_UBOOT_MACHINE_R5 = ""
-K3_UBOOT_MACHINE_R5_am65xx-evm = "am65x_evm_r5_defconfig"
-K3_UBOOT_MACHINE_R5_am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
-K3_UBOOT_MACHINE_R5_j7-evm = "j721e_evm_r5_config"
-K3_UBOOT_MACHINE_R5_j7-hs-evm = "j721e_hs_evm_r5_config"
+K3_UBOOT_MACHINE_R5:am65xx-evm = "am65x_evm_r5_defconfig"
+K3_UBOOT_MACHINE_R5:am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
+K3_UBOOT_MACHINE_R5:j7-evm = "j721e_evm_r5_config"
+K3_UBOOT_MACHINE_R5:j7-hs-evm = "j721e_hs_evm_r5_config"
 
-do_install_append_k3() {
+do_install:append:k3() {
     cat >> ${D}/Rules.make << __EOF__
 
 # Add CROSS_COMPILE and UBOOT_MACHINE for the R5
@@ -314,4 +314,4 @@ __EOF__
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN} = "/*"
+FILES:${PN} = "/*"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
index 5f7d9f15..a8b524ed 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
@@ -25,12 +25,12 @@ SETUP_SCRIPTS = " common.sh \
                   ${SDCARD_SCRIPT} \
 "
 
-UBOOT_ENV_omapl138 = "setup-uboot-env-am18x.sh"
-UBOOT_ENV_ti33x = "setup-uboot-env-am335x.sh"
-UBOOT_ENV_ti43x = "setup-uboot-env-am43x.sh"
-UBOOT_ENV_omap5-evm = "setup-uboot-env-omap5.sh"
-UBOOT_ENV_am57xx-evm = "setup-uboot-env-am57xx-evm.sh"
-UBOOT_ENV_k3 = "setup-uboot-env-am65x.sh"
+UBOOT_ENV:omapl138 = "setup-uboot-env-am18x.sh"
+UBOOT_ENV:ti33x = "setup-uboot-env-am335x.sh"
+UBOOT_ENV:ti43x = "setup-uboot-env-am43x.sh"
+UBOOT_ENV:omap5-evm = "setup-uboot-env-omap5.sh"
+UBOOT_ENV:am57xx-evm = "setup-uboot-env-am57xx-evm.sh"
+UBOOT_ENV:k3 = "setup-uboot-env-am65x.sh"
 UBOOT_ENV = "setup-uboot-unknown.sh"
 
 do_install () {
@@ -55,5 +55,5 @@ do_install () {
     fi
 }
 
-FILES_${PN} += "setup.sh"
-RDEPENDS_${PN} += "bash"
+FILES:${PN} += "setup.sh"
+RDEPENDS:${PN} += "bash"
diff --git a/meta-arago-distro/recipes-tisdk/tisdk-install/tisdk-install_1.0.bb b/meta-arago-distro/recipes-tisdk/tisdk-install/tisdk-install_1.0.bb
index e4188137..da8ecce0 100644
--- a/meta-arago-distro/recipes-tisdk/tisdk-install/tisdk-install_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/tisdk-install/tisdk-install_1.0.bb
@@ -12,4 +12,4 @@ do_install () {
 
 }
 
-FILES_${PN} = "/*"
+FILES:${PN} = "/*"
diff --git a/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb b/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb
index 6fdcaff3..59df0c97 100644
--- a/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb
+++ b/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb
@@ -19,4 +19,4 @@ do_install () {
     install -m 0644 ${S}/README ${D}/board-support/prebuilt-images/
 }
 
-FILES_${PN} += "board-support/*"
+FILES:${PN} += "board-support/*"
diff --git a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb
index 442e0673..76c83e7d 100644
--- a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb
+++ b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb
@@ -19,7 +19,7 @@ do_install () {
     install -m 0644 ${S}/uEnv.txt ${D}/board-support/prebuilt-images/
 }
 
-FILES_${PN} += "board-support/*"
+FILES:${PN} += "board-support/*"
 
 # deploy files for wic image
 inherit deploy
diff --git a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
index d75fb4b4..c6ed07ab 100644
--- a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
@@ -12,5 +12,5 @@ do_install () {
     install -m 0755 ${WORKDIR}/unshallow-repositories.sh ${D}/bin
 }
 
-FILES_${PN} = "/*"
-RDEPENDS_${PN} += "bash"
+FILES:${PN} = "/*"
+RDEPENDS:${PN} += "bash"
diff --git a/meta-arago-extras/classes/qt5.bbclass b/meta-arago-extras/classes/qt5.bbclass
index 8669ea42..a790ac7f 100644
--- a/meta-arago-extras/classes/qt5.bbclass
+++ b/meta-arago-extras/classes/qt5.bbclass
@@ -1,7 +1,7 @@
 # Class to mimic the old qt4e to prep recipe for use with Qt5 libraries
 
 QT5EDEPENDS ?= "qtbase "
-DEPENDS_prepend = "${QT5EDEPENDS}"
+DEPENDS:prepend = "${QT5EDEPENDS}"
 
 inherit qmake5
 
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index 5f105422..50d5f2c9 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-arago-extras"
 BBFILE_PATTERN_meta-arago-extras := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arago-extras = "10"
 
-LAYERSERIES_COMPAT_meta-arago-extras = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_meta-arago-extras = "honister"
 
 # Set a variable to get to the top of the metadata location
 ARAGOBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
@@ -17,7 +17,8 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
 
 LAYERDEPENDS_meta-arago-extras = " \
     core \
-    meta-ti \
+    meta-ti-bsp \
+    meta-ti-extras \
     openembedded-layer \
     networking-layer \
     meta-python \
diff --git a/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb b/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
index 0673c0a4..7d82b0ec 100644
--- a/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
+++ b/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
@@ -27,8 +27,8 @@ do_install() {
     install -m 644 ${S}/test/sample_barcode.jpg ${D}${datadir}/ti/image
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/image \
 "
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb
index a75b4aa5..b384bf87 100644
--- a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb
+++ b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb
@@ -25,7 +25,7 @@ EXTRA_OEMAKE = "\
     JOBS="${PARALLEL_MAKE}" \
 "
 
-do_create_srcipk_prepend() {
+do_create_srcipk:prepend() {
   rm -rf host_bios
 }
 
@@ -42,5 +42,5 @@ do_install() {
 }
 
 PACKAGES =+ "${PN}-firmware"
-FILES_${PN}-firmware += "${bindir}/simple_buffer_example/release/server_dsp.xe66"
-INSANE_SKIP_${PN}-firmware += "arch"
+FILES:${PN}-firmware += "${bindir}/simple_buffer_example/release/server_dsp.xe66"
+INSANE_SKIP:${PN}-firmware += "arch"
diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
index 92b39914..32ead99c 100644
--- a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
+++ b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc
@@ -20,10 +20,10 @@ PV = "01.03.00.00"
 S = "${WORKDIR}/git"
 
 PLATFORM = "UNKNOWN"
-PLATFORM_omap-a15 = "DRA7XX"
+PLATFORM:omap-a15 = "DRA7XX"
 
 IPC_TARGETS = ""
-IPC_TARGETS_omap-a15 = "\
+IPC_TARGETS:omap-a15 = "\
     gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
     ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
     ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \
diff --git a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
index 2a9750da..537cec01 100644
--- a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
+++ b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
@@ -26,6 +26,6 @@ do_install() {
 
 PACKAGES += "matrix-gui-apps-image-gallery"
 
-RDEPENDS_matrix-gui-apps-image-gallery  = "matrix-gui-apps-images matrix-gui-submenus-camera ${PN}"
+RDEPENDS:matrix-gui-apps-image-gallery  = "matrix-gui-apps-images matrix-gui-submenus-camera ${PN}"
 
-FILES_matrix-gui-apps-image-gallery += "${MATRIX_APP_DIR}/*"
+FILES:matrix-gui-apps-image-gallery += "${MATRIX_APP_DIR}/*"
diff --git a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
index e4f43f1d..8f70ac2a 100644
--- a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
+++ b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb
@@ -23,4 +23,4 @@ do_install() {
     install -m 644 ${S}/logs/* ${D}${datadir}/ti/examples/pdm
 }
 
-FILES_${PN} += "${datadir}/ti/examples/pdm"
+FILES:${PN} += "${datadir}/ti/examples/pdm"
diff --git a/meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb b/meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
index 6e4394b6..bbc2558e 100644
--- a/meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
+++ b/meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb
@@ -21,7 +21,7 @@ PV = "2.2"
 
 S = "${WORKDIR}/git"
 
-RDEPENDS_${PN} = "opencv libxkbcommon"
+RDEPENDS:${PN} = "opencv libxkbcommon"
 
 do_install() {
     install -d ${D}${bindir}
@@ -31,8 +31,8 @@ do_install() {
     install -m 644 ${S}/example_point_cloud.xyz ${D}${datadir}/ti/pointclouds
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/pointclouds \
 "
 
-INSANE_SKIP_${PN} = "already-stripped file-rdeps"
+INSANE_SKIP:${PN} = "already-stripped file-rdeps"
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
index a0f2c937..c4eb10ee 100644
--- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
@@ -33,6 +33,6 @@ do_install() {
 
 PACKAGES += "matrix-gui-thermostat-demo"
 
-RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt5"
+RDEPENDS:matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt5"
 
-FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
+FILES:matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
diff --git a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
index 9a25e911..5b085641 100644
--- a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
+++ b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb
@@ -29,7 +29,7 @@ export TARGET_ROOTDIR = "${STAGING_DIR_HOST}"
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 export TI_DSPLIB_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ti-dsplib-c66x-tree"
 
-CXXFLAGS_append = " -DOCV_NATIVE "
+CXXFLAGS:append = " -DOCV_NATIVE "
 
 do_compile() {
     cd ${S}
@@ -43,4 +43,4 @@ do_install() {
     install -m 755 qt-opencv-opencl-opengl-multithreaded ${D}/usr/bin/qt-opencv-opencl-opengl-multithreaded
 }
 
-RDEPENDS_${PN} += "opencv opencl-runtime"
+RDEPENDS:${PN} += "opencv opencl-runtime"
diff --git a/meta-arago-extras/recipes-benchmark/stream/stream_5.10.bb b/meta-arago-extras/recipes-benchmark/stream/stream_5.10.bb
index 76617224..a3657b58 100644
--- a/meta-arago-extras/recipes-benchmark/stream/stream_5.10.bb
+++ b/meta-arago-extras/recipes-benchmark/stream/stream_5.10.bb
@@ -26,4 +26,4 @@ do_install() {
 	install -m 0755 ${S}/stream_c_openmp ${D}/${bindir}/
 }
 
-FILES_${PN}-openmp = "${bindir}/stream_c_openmp"
+FILES:${PN}-openmp = "${bindir}/stream_c_openmp"
diff --git a/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb b/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
index dca4bfe1..f3993f1e 100644
--- a/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
+++ b/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
@@ -6,10 +6,10 @@ PV = "2.0"
 PR = "r5"
 
 BRANCH ?= "v4.1"
-BRANCH_aarch64 ?= "am65x-v1.0"
+BRANCH:aarch64 ?= "am65x-v1.0"
 
 SRCREV = "412dce4e65cfe5af729be38fd1b4c1d59e9a8828"
-SRCREV_aarch64 = "0f52dcb3c4e3678e96427d546d6c2e1fabc2ad91"
+SRCREV:aarch64 = "0f52dcb3c4e3678e96427d546d6c2e1fabc2ad91"
 
 SRC_URI = "git://git.ti.com/switch-config/switch-config.git;protocol=git;branch=${BRANCH}"
 
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx.bb b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx.bb
index 0288a54d..67179602 100644
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx.bb
+++ b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx.bb
@@ -6,9 +6,9 @@ require hostap.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=292eece3f2ebbaa25608eed8464018a3"
 
-PR_append = "e"
+PR:append = "e"
 
-FILESEXTRAPATHS_append := ":${THISDIR}/hostap-daemon"
+FILESEXTRAPATHS:append := ":${THISDIR}/hostap-daemon"
 
 # Add TI to the end to make it clear that this is a TI customized version
 # of hostap
@@ -19,6 +19,6 @@ SRCREV = "ee8fbdb840d95e048f58fb62bf3b5472041b5417"
 BRANCH = "upstream_25_rebase"
 
 PROVIDES += "hostap-daemon"
-RPROVIDES_${PN} += "hostap-daemon"
-RREPLACES_${PN} += "hostap-daemon"
-RCONFLICTS_${PN} += "hostap-daemon"
+RPROVIDES:${PN} += "hostap-daemon"
+RREPLACES:${PN} += "hostap-daemon"
+RCONFLICTS:${PN} += "hostap-daemon"
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap.inc b/meta-arago-extras/recipes-connectivity/hostap/hostap.inc
index 324de0be..72cdc4b1 100644
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap.inc
+++ b/meta-arago-extras/recipes-connectivity/hostap/hostap.inc
@@ -16,7 +16,7 @@ PR = "r6"
 inherit update-rc.d pkgconfig
 INITSCRIPT_NAME="hostapd"
 
-CONFFILES_${PN} += "${sysconfdir}/hostapd.conf"
+CONFFILES:${PN} += "${sysconfdir}/hostapd.conf"
 
 SRC_URI = "git://git.ti.com/wilink8-wlan/hostap.git;protocol=git;branch=${BRANCH} \
            file://defconfig \
diff --git a/meta-arago-extras/recipes-connectivity/open62541/open62541_git.bb b/meta-arago-extras/recipes-connectivity/open62541/open62541_git.bb
index e28f96f5..02b63738 100644
--- a/meta-arago-extras/recipes-connectivity/open62541/open62541_git.bb
+++ b/meta-arago-extras/recipes-connectivity/open62541/open62541_git.bb
@@ -57,7 +57,7 @@ PACKAGECONFIG ?= "pubsub pubsub_delta_frames pubsub_informationmodel \
                   certificate"
 
 # Install examples and unit tests
-do_install_append() {
+do_install:append() {
     # Install examples
     install -d "${D}${datadir}/${BPN}/examples"
     for example in ${B}/bin/examples/*
@@ -77,15 +77,15 @@ do_install_append() {
 }
 
 PACKAGES =+ "${PN}-examples ${PN}-tests"
-FILES_${PN}-dev += "${libdir}/cmake/* ${datadir}/${BPN}/tools"
-FILES_${PN}-examples += "${datadir}/${BPN}/examples"
-FILES_${PN}-tests += "${datadir}/${BPN}/tests"
+FILES:${PN}-dev += "${libdir}/cmake/* ${datadir}/${BPN}/tools"
+FILES:${PN}-examples += "${datadir}/${BPN}/examples"
+FILES:${PN}-tests += "${datadir}/${BPN}/tests"
 
 # This contains some python-based tools
-RDEPENDS_${PN}-dev = "python3"
+RDEPENDS:${PN}-dev = "python3"
 
 # Allow staticdev package to be empty incase sharedlibs is switched on
-ALLOW_EMPTY_${PN}-staticdev = "1"
-ALLOW_EMPTY_${PN}-tests = "1"
+ALLOW_EMPTY:${PN}-staticdev = "1"
+ALLOW_EMPTY:${PN}-tests = "1"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-connectivity/vtun/vtun_3.0.3.bb b/meta-arago-extras/recipes-connectivity/vtun/vtun_3.0.3.bb
index 4450cc1c..f425d163 100644
--- a/meta-arago-extras/recipes-connectivity/vtun/vtun_3.0.3.bb
+++ b/meta-arago-extras/recipes-connectivity/vtun/vtun_3.0.3.bb
@@ -21,7 +21,7 @@ do_configure() {
 	oe_runconf --with-lzo-headers=${STAGING_INCDIR}/lzo --with-lzo-lib=${STAGING_LIBDIR} --with-ssl-headers=${STAGING_INCDIR}/openssl --with-ssl-lib=${STAGING_LIBDIR}
 }
 
-do_install_append() {
+do_install:append() {
 	rm -rf ${D}${localstatedir}/run
 	rm -rf ${D}${localstatedir}/lock
 }
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
index 1b3b8d05..59e64df2 100644
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
@@ -8,18 +8,18 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=292eece3f2ebbaa25608eed8464018a3 \
                     file://../README;md5=3f01d778be8f953962388307ee38ed2b \
                     file://wpa_supplicant.c;beginline=1;endline=17;md5=35e6d71fea6b15f61a9fac935bcf410f"
 
-FILESEXTRAPATHS_append := ":${THISDIR}/wpa-supplicant"
+FILESEXTRAPATHS:append := ":${THISDIR}/wpa-supplicant"
 
 # Tag: R8.7_SP3
 SRCREV = "ee8fbdb840d95e048f58fb62bf3b5472041b5417"
 BRANCH = "upstream_25_rebase"
-PR_append = "b"
+PR:append = "b"
 
 # Add ti to the PV to indicate that this is a TI modify version of wpa-supplicant.
 PV = "R8.7_SP3-devel-ti+git${SRCPV}"
 
 PROVIDES += "wpa-supplicant"
-RPROVIDES_${PN}  += "wpa-supplicant"
-RREPLACES_${PN}  += "wpa-supplicant"
-RCONFLICTS_${PN}  += "wpa-supplicant"
-RDEPENDS_${PN} += "wpa-supplicant-cli wpa-supplicant-passphrase"
+RPROVIDES:${PN}  += "wpa-supplicant"
+RREPLACES:${PN}  += "wpa-supplicant"
+RCONFLICTS:${PN}  += "wpa-supplicant"
+RDEPENDS:${PN} += "wpa-supplicant-cli wpa-supplicant-passphrase"
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index 65693270..4ed2d353 100644
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -10,7 +10,7 @@ LICENSE = "GPLv2 | BSD"
 inherit pkgconfig
 
 DEPENDS = "gnutls dbus libnl openssl libgcrypt"
-RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 # To prevent users from accidently picking up this customized version of
 # wpa-supplicant the DEFAULT_PREFERENCE will be set to -1.
@@ -29,10 +29,10 @@ SRC_URI += "file://crypto_openssl.patch;patchdir=.."
 
 S = "${WORKDIR}/git/wpa_supplicant"
 
-PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
-FILES_wpa-supplicant-passphrase = "${sbindir}/wpa_passphrase"
-FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
-FILES_${PN} += "${datadir}/dbus-1/system-services/*"
+PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
+FILES:wpa-supplicant-passphrase = "${sbindir}/wpa_passphrase"
+FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli"
+FILES:${PN} += "${datadir}/dbus-1/system-services/*"
 
 do_configure () {
 	install -m 0755 ${WORKDIR}/defconfig .config
@@ -81,7 +81,7 @@ do_install () {
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
-pkg_postinst_wpa-supplicant () {
+pkg_postinst:wpa-supplicant () {
 	# If we're offline, we don't need to do this.
 	if [ "x$D" = "x" ]; then
 		killall -q -HUP dbus-daemon || true
diff --git a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
index 4df536fd..0cd24690 100644
--- a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
+++ b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
@@ -26,4 +26,4 @@ do_install() {
 	install -m 0755 ${S}/mem_util/Release/mem_util ${D}/${bindir}
 }
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common.bb b/meta-arago-extras/recipes-core/llvm/llvm-common.bb
index 07bc8316..b69a5775 100644
--- a/meta-arago-extras/recipes-core/llvm/llvm-common.bb
+++ b/meta-arago-extras/recipes-core/llvm/llvm-common.bb
@@ -4,15 +4,15 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://llvm-config"
 
-ALLOW_EMPTY_${PN} = "1"
-SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess"
+ALLOW_EMPTY:${PN} = "1"
+SYSROOT_PREPROCESS_FUNCS:append:class-target = " llvm_common_sysroot_preprocess"
 
 llvm_common_sysroot_preprocess() {
     install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
     install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 }
 
-do_install_class-native() {
+do_install:class-native() {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
 }
diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend b/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend
index 27c27f5e..273fb314 100644
--- a/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend
+++ b/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend
@@ -1,5 +1,5 @@
-PR_append = ".arago0"
+PR:append = ".arago0"
 
-SYSROOT_PREPROCESS_FUNCS_append_class-nativesdk = " llvm_common_sysroot_preprocess"
+SYSROOT_PREPROCESS_FUNCS:append:class-nativesdk = " llvm_common_sysroot_preprocess"
 
 BBCLASSEXTEND += "nativesdk"
diff --git a/meta-arago-extras/recipes-core/llvm/llvm.inc b/meta-arago-extras/recipes-core/llvm/llvm.inc
index b1a48f62..64451af8 100644
--- a/meta-arago-extras/recipes-core/llvm/llvm.inc
+++ b/meta-arago-extras/recipes-core/llvm/llvm.inc
@@ -49,7 +49,7 @@ EXTRA_OECONF += "--disable-assertions \
                  --enable-targets=host-only"
 EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
 
-do_configure_prepend() {
+do_configure:prepend() {
     # Remove RPATHs
     sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules
 
@@ -117,34 +117,34 @@ llvm_sysroot_preprocess() {
 }
 
 PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello"
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-staticdev = "1"
-FILES_${PN} = ""
-FILES_${PN}-staticdev = ""
-FILES_${PN}-dbg = " \
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-staticdev = "1"
+FILES:${PN} = ""
+FILES:${PN}-staticdev = ""
+FILES:${PN}-dbg = " \
     ${bindir}/${LLVM_DIR}/.debug \
     ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \
     ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \
     /usr/src/debug \
 "
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${bindir}/${LLVM_DIR} \
     ${includedir}/${LLVM_DIR} \
 "
-RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello"
+RRECOMMENDS:${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello"
 
-FILES_${PN}-bugpointpasses = "\
+FILES:${PN}-bugpointpasses = "\
     ${libdir}/${LLVM_DIR}/BugpointPasses.so \
 "
-FILES_${PN}-llvmhello = "\
+FILES:${PN}-llvmhello = "\
     ${libdir}/${LLVM_DIR}/LLVMHello.so \
 "
 
 PACKAGES_DYNAMIC = "^libllvm${LLVM_RELEASE}-.*$"
 NOAUTOPACKAGEDEBUG = "1"
 
-INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so"
+INSANE_SKIP:${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so"
 
 python llvm_populate_packages() {
     libdir = bb.data.expand('${libdir}', d)
@@ -154,9 +154,9 @@ python llvm_populate_packages() {
     split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True)
     if split_packages:
         pn = d.getVar('PN')
-        d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages))
-        d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages))
-        d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages))
+        d.appendVar('RDEPENDS:' + pn, ' '+' '.join(split_packages))
+        d.appendVar('RDEPENDS:' + pn + '-dbg', ' '+' '.join(split_dbg_packages))
+        d.appendVar('RDEPENDS:' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages))
 }
 
-PACKAGESPLITFUNCS_prepend = "llvm_populate_packages "
+PACKAGESPLITFUNCS:prepend = "llvm_populate_packages "
diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
index a6739efe..05c71a1d 100644
--- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
+++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://git.ti.com/opencl/llvm"
 
 PR = "r7"
 
-do_configure_prepend_class-native() {
+do_configure:prepend:class-native() {
     # Fix paths in llvm-config
     sed -i "s|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|sys::path::parent_path(CurrentPath))\.str()|g" ${S}/tools/llvm-config/llvm-config.cpp
 }
 
-do_configure_prepend() {
+do_configure:prepend() {
     # Workaround for libdir fix for multilib to undo what is currently upstream
     sed -i 's:${base_libdir}:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp
 }
@@ -18,7 +18,7 @@ require recipes-core/llvm/llvm.inc
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
 
 DEPENDS += "libxml2 groff-native"
-DEPENDS_append_class-target = " valgrind"
+DEPENDS:append:class-target = " valgrind"
 
 LLVM_DIR = "ti-llvm${PV}"
 
@@ -58,7 +58,7 @@ EXTRA_OECONF += " --enable-targets="host,arm,c6000,msp430" \
 
 EXTRA_OEMAKE += "LIBXML2_INC="${LIBXML2_INC}" LIBXML2_LIBS="${LIBXML2_LIBS}""
 
-do_compile_class-native() {
+do_compile:class-native() {
   cd ${LLVM_BUILD_DIR}
 
   # Fix libdir for multilib
@@ -67,7 +67,7 @@ do_compile_class-native() {
   oe_runmake
 }
 
-do_compile_class-nativesdk() {
+do_compile:class-nativesdk() {
     cd ${LLVM_BUILD_DIR}
 
     # Fix libdir for multilib
@@ -119,7 +119,7 @@ do_compile() {
     oe_runmake
 }
 
-do_install_append_class-target() {
+do_install:append:class-target() {
     for b in ${D}${bindir}/${LLVM_DIR}/${HOST_SYS}-clang*; do
         if [ ! -L ${b} ]; then
             mv ${b} ${D}${bindir}/`echo "${b}" | sed -e 's|${D}${bindir}/${LLVM_DIR}/${HOST_SYS}-||g'`
@@ -127,7 +127,7 @@ do_install_append_class-target() {
     done
 }
 
-do_install_class-native() {
+do_install:class-native() {
     cd ${LLVM_BUILD_DIR}
     oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install
 
@@ -158,8 +158,8 @@ do_install_class-native() {
 }
 
 
-SYSROOT_PREPROCESS_FUNCS_class-target += "llvm_sysroot_preprocess_target"
-SYSROOT_PREPROCESS_FUNCS_class-nativesdk += "llvm_sysroot_preprocess_target"
+SYSROOT_PREPROCESS_FUNCS:class-target += "llvm_sysroot_preprocess_target"
+SYSROOT_PREPROCESS_FUNCS:class-nativesdk += "llvm_sysroot_preprocess_target"
 
 llvm_sysroot_preprocess() {
     :
@@ -170,7 +170,7 @@ llvm_sysroot_preprocess_target() {
     mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}-ti
 }
 
-INSANE_SKIP_${PN} += "installed-vs-shipped"
-INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so"
+INSANE_SKIP:${PN} += "installed-vs-shipped"
+INSANE_SKIP:${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
index 9bc32cdf..2c2aef82 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb
@@ -27,70 +27,70 @@ PACKAGES = "matrix-3d-demo-chameleon \
             matrix-3d-demo-exampleui    \
 "
 
-PACKAGES_append_omap-a15 = " \
+PACKAGES:append:omap-a15 = " \
             matrix-3d-demo-kmscube      \
             matrix-3d-demo-kmscubevideo \
 "
 
-PACKAGES_append_ti43x = " \
+PACKAGES:append:ti43x = " \
             matrix-3d-demo-kmscube \
 "
 
-PACKAGES_append_ti33x = " \
+PACKAGES:append:ti33x = " \
             matrix-3d-demo-kmscube \
 "
 
-PACKAGES_append_k3 = " \
+PACKAGES:append:k3 = " \
             matrix-3d-demo-kmscube \
 "
 
 MATRIX_3D_DEMO_SGX_QAF_PARAM = "1000"
 
-do_install_prepend() {
+do_install:prepend() {
     find ${S} -name '*.desktop' -exec sed -i {} \
         -e "s|-qaf=[0-9]*|-qaf=${MATRIX_3D_DEMO_SGX_QAF_PARAM}|g" \;
 }
 
 3D_DEMOS_RDEPENDS_MATRIX = "matrix-gui-apps-images matrix-gui-submenus-3d"
 3D_DEMOS_RDEPENDS = "${3D_DEMOS_RDEPENDS_MATRIX}"
-3D_DEMOS_RDEPENDS_omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
-3D_DEMOS_RDEPENDS_ti43x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
-3D_DEMOS_RDEPENDS_ti33x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
-3D_DEMOS_RDEPENDS_k3       = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
-
-RDEPENDS_matrix-3d-demo-chameleon = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-coverflow = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-film      = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-lantern   = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-skull     = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-shaders   = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-vase      = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-navigation    = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-exampleui     = "${3D_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-3d-demo-kmscube       = "${3D_DEMOS_RDEPENDS_MATRIX} kmscube"
-#RDEPENDS_matrix-3d-demo-kmscubevideo  = "${3D_DEMOS_RDEPENDS_MATRIX} omapdrmtest"
-RDEPENDS_matrix-3d-demo-kmscubevideo  = "${3D_DEMOS_RDEPENDS_MATRIX}"
+3D_DEMOS_RDEPENDS:omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
+3D_DEMOS_RDEPENDS:ti43x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
+3D_DEMOS_RDEPENDS:ti33x    = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
+3D_DEMOS_RDEPENDS:k3       = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk"
+
+RDEPENDS:matrix-3d-demo-chameleon = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-coverflow = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-film      = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-lantern   = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-skull     = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-shaders   = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-vase      = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-navigation    = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-exampleui     = "${3D_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-3d-demo-kmscube       = "${3D_DEMOS_RDEPENDS_MATRIX} kmscube"
+#RDEPENDS:matrix-3d-demo-kmscubevideo  = "${3D_DEMOS_RDEPENDS_MATRIX} omapdrmtest"
+RDEPENDS:matrix-3d-demo-kmscubevideo  = "${3D_DEMOS_RDEPENDS_MATRIX}"
 
 # Split the matrix files by 3d demos
-FILES_matrix-3d-demo-chameleon = "${MATRIX_APP_DIR}/3d_chameleon/*"
-FILES_matrix-3d-demo-coverflow = "${MATRIX_APP_DIR}/3d_coverflow/*"
-FILES_matrix-3d-demo-film      = "${MATRIX_APP_DIR}/3d_film/*"
-FILES_matrix-3d-demo-lantern   = "${MATRIX_APP_DIR}/3d_lantern/*"
-FILES_matrix-3d-demo-skull     = "${MATRIX_APP_DIR}/3d_skull/*"
-FILES_matrix-3d-demo-shaders   = "${MATRIX_APP_DIR}/3d_shaders/*"
-FILES_matrix-3d-demo-vase      = "${MATRIX_APP_DIR}/3d_vase/*"
-FILES_matrix-3d-demo-navigation       = "${MATRIX_APP_DIR}/3d_navigation/*"
-FILES_matrix-3d-demo-exampleui        = "${MATRIX_APP_DIR}/3d_exampleui/*"
-FILES_matrix-3d-demo-kmscube          = "${MATRIX_APP_DIR}/3d_kmscube/*"
-FILES_matrix-3d-demo-kmscubevideo     = "${MATRIX_APP_DIR}/3d_kmscubevideo/*"
+FILES:matrix-3d-demo-chameleon = "${MATRIX_APP_DIR}/3d_chameleon/*"
+FILES:matrix-3d-demo-coverflow = "${MATRIX_APP_DIR}/3d_coverflow/*"
+FILES:matrix-3d-demo-film      = "${MATRIX_APP_DIR}/3d_film/*"
+FILES:matrix-3d-demo-lantern   = "${MATRIX_APP_DIR}/3d_lantern/*"
+FILES:matrix-3d-demo-skull     = "${MATRIX_APP_DIR}/3d_skull/*"
+FILES:matrix-3d-demo-shaders   = "${MATRIX_APP_DIR}/3d_shaders/*"
+FILES:matrix-3d-demo-vase      = "${MATRIX_APP_DIR}/3d_vase/*"
+FILES:matrix-3d-demo-navigation       = "${MATRIX_APP_DIR}/3d_navigation/*"
+FILES:matrix-3d-demo-exampleui        = "${MATRIX_APP_DIR}/3d_exampleui/*"
+FILES:matrix-3d-demo-kmscube          = "${MATRIX_APP_DIR}/3d_kmscube/*"
+FILES:matrix-3d-demo-kmscubevideo     = "${MATRIX_APP_DIR}/3d_kmscubevideo/*"
 
 # Split the ${bindir} files by 3d demos
-FILES_matrix-3d-demo-chameleon += "${bindir}/runOGLES2ChameleonMan.sh"
-FILES_matrix-3d-demo-coverflow += "${bindir}/runOGLES2Coverflow.sh"
-FILES_matrix-3d-demo-film      += "${bindir}/runOGLESFilmTV.sh"
-FILES_matrix-3d-demo-lantern   += "${bindir}/runOGLES2MagicLantern.sh"
-FILES_matrix-3d-demo-skull     += "${bindir}/runOGLESEvilSkull.sh"
-FILES_matrix-3d-demo-shaders   += "${bindir}/runOGLES2Shaders.sh"
-FILES_matrix-3d-demo-vase      += "${bindir}/runOGLESVase.sh"
-FILES_matrix-3d-demo-navigation      += "${bindir}/runOGLES2Navigation.sh"
-FILES_matrix-3d-demo-exampleui       += "${bindir}/runOGLES2ExampleUI.sh"
+FILES:matrix-3d-demo-chameleon += "${bindir}/runOGLES2ChameleonMan.sh"
+FILES:matrix-3d-demo-coverflow += "${bindir}/runOGLES2Coverflow.sh"
+FILES:matrix-3d-demo-film      += "${bindir}/runOGLESFilmTV.sh"
+FILES:matrix-3d-demo-lantern   += "${bindir}/runOGLES2MagicLantern.sh"
+FILES:matrix-3d-demo-skull     += "${bindir}/runOGLESEvilSkull.sh"
+FILES:matrix-3d-demo-shaders   += "${bindir}/runOGLES2Shaders.sh"
+FILES:matrix-3d-demo-vase      += "${bindir}/runOGLESVase.sh"
+FILES:matrix-3d-demo-navigation      += "${bindir}/runOGLES2Navigation.sh"
+FILES:matrix-3d-demo-exampleui       += "${bindir}/runOGLES2ExampleUI.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
index 61cc9085..9d7eb444 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-analytics-demos_2.0.bb
@@ -11,16 +11,16 @@ S = "${WORKDIR}/git/analytics_apps"
 # Make sure analytics submenu and app images has been installed
 ANALYTICSDEMO_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-analytics"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-analytics-pdm-anomaly-detection \
 "
 
-RDEPENDS_matrix-analytics-pdm-anomaly-detection = " \
+RDEPENDS:matrix-analytics-pdm-anomaly-detection = " \
     bash \
     ${ANALYTICSDEMO_RDEPENDS} \
     pdm-anomaly-detection \
 "
 
-FILES_matrix-analytics-pdm-anomaly-detection = "${MATRIX_APP_DIR}/analytics_pdm_anomaly_detection/*"
-FILES_matrix-analytics-pdm-anomaly-detection += "${bindir}/runPdmAnomalyDetection.sh"
+FILES:matrix-analytics-pdm-anomaly-detection = "${MATRIX_APP_DIR}/analytics_pdm_anomaly_detection/*"
+FILES:matrix-analytics-pdm-anomaly-detection += "${bindir}/runPdmAnomalyDetection.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
index a84e130c..fb61b340 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
@@ -11,4 +11,4 @@ INC_PR = "r76"
 # Pull in the base package for installing matrix applications
 require matrix-gui-apps.inc
 
-INSANE_SKIP_${PN} += "installed-vs-shipped"
+INSANE_SKIP:${PN} += "installed-vs-shipped"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
index a1c46ca0..b7c34896 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-images_2.0.bb
@@ -13,4 +13,4 @@ do_install(){
     cp -rf ${S}/ ${D}${MATRIX_APP_DIR}
 }
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
index 4d3b609c..2bcc908b 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
@@ -6,7 +6,7 @@ MATRIX_FILES_DIR ?= "${S}"
 # MATRIX_FILES_DIR for .desktop files and then:
 #   1.  Install all non-script files into the MATRIX_APP_DIR
 #   2.  Install all script files into ${bindir}
-do_install_append(){
+do_install:append(){
     cd ${MATRIX_FILES_DIR}
     applist=`find . -name "*.desktop"`
 
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
index 36598517..b6885a73 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-armbenchmarks-demos_2.0.bb
@@ -9,9 +9,9 @@ inherit allarch
 S = "${WORKDIR}/git/arm_apps"
 
 # Make sure arm submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-arm"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-arm"
 
 # Make sure the benchmarks have been installed
-RDEPENDS_${PN} += "arm-benchmarks lmbench nbench-byte matrix-gui-helper-scripts"
+RDEPENDS:${PN} += "arm-benchmarks lmbench nbench-byte matrix-gui-helper-scripts"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
index 745a477b..edbdd49b 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
@@ -9,7 +9,7 @@ inherit allarch
 S = "${WORKDIR}/git/browser_apps"
 
 # Make sure browser submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-browser"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-browser"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
-FILES_${PN} += "${bindir}/runGoogleChrome.sh"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${bindir}/runGoogleChrome.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
index 835ba9e1..a020514b 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-camera-loopback_2.0.bb
@@ -7,6 +7,6 @@ PR = "${INC_PR}.1"
 S = "${WORKDIR}/git/cameraloopback_apps"
 
 # Make sure loopback application is compiled and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images av-examples"
+RDEPENDS:${PN} += "matrix-gui-apps-images av-examples"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb
index 1b2c47e3..3a178cd7 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-clocks_2.0.bb
@@ -8,19 +8,19 @@ inherit allarch
 
 S = "${WORKDIR}/git/clocks_apps"
 
-do_install_prepend(){
+do_install:prepend(){
    install -d ${D}${MATRIX_BASE_DIR}/html-apps/
 
    cp -rf ${S}/set_frequency/power-set-frequency ${D}${MATRIX_BASE_DIR}/html-apps/
 
 }
 
-do_install_append(){
+do_install:append(){
     rm ${D}${MATRIX_APP_DIR}/set_frequency/set-frequency.php
 }
 # Make sure power submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
+FILES:${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
                 ${MATRIX_BASE_DIR}/apps/ \
 "
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
index 9fd48820..5e07519a 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb
@@ -7,11 +7,11 @@ PR = "${INC_PR}.12"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/cryptos_apps_scripts"
-S_ti33x = "${WORKDIR}/git/cryptos_apps_program"
-S_ti43x = "${WORKDIR}/git/cryptos_apps_program"
-S_dra7xx = "${WORKDIR}/git/cryptos_apps_program"
+S:ti33x = "${WORKDIR}/git/cryptos_apps_program"
+S:ti43x = "${WORKDIR}/git/cryptos_apps_program"
+S:dra7xx = "${WORKDIR}/git/cryptos_apps_program"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 # Make sure crypto submenu and app images has been installed. Also make sure openssl is available
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl matrix-gui-helper-scripts"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl matrix-gui-helper-scripts"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb
index 5dee50b9..1f9a4d35 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-display-control_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/displaycontrol_apps"
 
 # Make sure display submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-display"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-display"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
index 49497753..2982d32e 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-ethernet-demos_2.0.bb
@@ -17,14 +17,14 @@ SRC_URI += "file://udhcpd_eth1.conf"
 
 S = "${WORKDIR}/git/ethernet_apps"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}
     install -m 0755 ${WORKDIR}/udhcpd_eth1.conf ${D}${sysconfdir}
 }
 
 # Make sure ethernet submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-ethernet"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-ethernet"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/* \
+FILES:${PN} += "${MATRIX_BASE_DIR}/* \
                 ${sysconfdir}/udhcpd_eth1.conf"
-CONFFILES_${PN} += "${sysconfdir}/udhcpd_eth1.conf"
+CONFFILES:${PN} += "${sysconfdir}/udhcpd_eth1.conf"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb
index 295db8c1..4db1d8d2 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-helper-scripts.bb
@@ -8,9 +8,9 @@ inherit allarch
 
 S = "${WORKDIR}/git/scripts"
 
-do_install_append(){
+do_install:append(){
     install -d ${D}${bindir}
     install -m 0755 ${S}/optimize-benchmark.sh ${D}${bindir}/ 
 }
 
-FILES_${PN} += "{bindir}/*"
+FILES:${PN} += "{bindir}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
index 9d9cc89e..1427ef0a 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
@@ -11,36 +11,36 @@ S = "${WORKDIR}/git/hmi_apps"
 # Make sure machinevision submenu and app images has been installed
 HMI_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-hmi"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-hmi-demo-evse \
 	    matrix-hmi-demo-protection-relays \
 	    matrix-hmi-demo-mmwavegesture \
 "
 
-RDEPENDS_matrix-hmi-demo-evse = " \
+RDEPENDS:matrix-hmi-demo-evse = " \
     bash \
     ${HMI_RDEPENDS} \
     evse-hmi \
 "
 
-RDEPENDS_matrix-hmi-demo-protection-relays = " \
+RDEPENDS:matrix-hmi-demo-protection-relays = " \
     bash \
     ${HMI_RDEPENDS} \
     protection-relays-hmi \
 "
 
-RDEPENDS_matrix-hmi-demo-mmwavegesture = " \
+RDEPENDS:matrix-hmi-demo-mmwavegesture = " \
     bash \
     ${HMI_RDEPENDS} \
     mmwavegesture-hmi \
 "
 
-FILES_matrix-hmi-demo-evse    = "${MATRIX_APP_DIR}/hmi_evse/*"
-FILES_matrix-hmi-demo-evse  += "${bindir}/runHmiEvse.sh"
+FILES:matrix-hmi-demo-evse    = "${MATRIX_APP_DIR}/hmi_evse/*"
+FILES:matrix-hmi-demo-evse  += "${bindir}/runHmiEvse.sh"
 
-FILES_matrix-hmi-demo-protection-relays   = "${MATRIX_APP_DIR}/hmi_protection_relays/*"
-FILES_matrix-hmi-demo-protection-relays  += "${bindir}/runHmiProtectionRelays.sh"
+FILES:matrix-hmi-demo-protection-relays   = "${MATRIX_APP_DIR}/hmi_protection_relays/*"
+FILES:matrix-hmi-demo-protection-relays  += "${bindir}/runHmiProtectionRelays.sh"
 
-FILES_matrix-hmi-demo-mmwavegesture    = "${MATRIX_APP_DIR}/hmi_mmwave/*"
-FILES_matrix-hmi-demo-mmwavegesture  += "${bindir}/runHmiMmWave.sh"
+FILES:matrix-hmi-demo-mmwavegesture    = "${MATRIX_APP_DIR}/hmi_mmwave/*"
+FILES:matrix-hmi-demo-mmwavegesture  += "${bindir}/runHmiMmWave.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
index 193da657..16482003 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
@@ -16,7 +16,7 @@ BARCODE_RDEPENDS = ""
 #    ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-machinevision-demo-dlp3dscanner \
             matrix-machinevision-demo-barcoderoi \
@@ -24,35 +24,35 @@ PACKAGES = "matrix-machinevision-demo-dlp3dscanner \
             matrix-machinevision-demo-simplepeopletracking \
 "
 
-RDEPENDS_matrix-machinevision-demo-dlp3dscanner = " \
+RDEPENDS:matrix-machinevision-demo-dlp3dscanner = " \
     ${MACHINEVISION_RDEPENDS} \
 "
 
-RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \
+RDEPENDS:matrix-machinevision-demo-dlp3dscanner:append:dra7xx = " \
     ${@['','point-cloud-viewer'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d)]} \
 "
 
-RDEPENDS_matrix-machinevision-demo-barcoderoi = " \
+RDEPENDS:matrix-machinevision-demo-barcoderoi = " \
     ${MACHINEVISION_RDEPENDS} \
     ${BARCODE_RDEPENDS} \
 "
 
-RDEPENDS_matrix-machinevision-demo-barcoderoi-f2f = " \
+RDEPENDS:matrix-machinevision-demo-barcoderoi-f2f = " \
     ${MACHINEVISION_RDEPENDS} \
     ${BARCODE_RDEPENDS} \
 "
 
-RDEPENDS_matrix-machinevision-demo-simplepeopletracking = " \
+RDEPENDS:matrix-machinevision-demo-simplepeopletracking = " \
     ${MACHINEVISION_RDEPENDS} \
 "
 
-FILES_matrix-machinevision-demo-dlp3dscanner    = "${MATRIX_APP_DIR}/machinevision_dlp_3d_scanner/*"
-FILES_matrix-machinevision-demo-dlp3dscanner   += "${bindir}/runDlp3DScanner.sh"
+FILES:matrix-machinevision-demo-dlp3dscanner    = "${MATRIX_APP_DIR}/machinevision_dlp_3d_scanner/*"
+FILES:matrix-machinevision-demo-dlp3dscanner   += "${bindir}/runDlp3DScanner.sh"
 
-FILES_matrix-machinevision-demo-barcoderoi    = "${MATRIX_APP_DIR}/machinevision_barcode_roi/*"
-FILES_matrix-machinevision-demo-barcoderoi   += "${bindir}/runBarcodeRoi.sh"
-FILES_matrix-machinevision-demo-barcoderoi-f2f = "${MATRIX_APP_DIR}/machinevision_barcode_roi_f2f/*"
-FILES_matrix-machinevision-demo-barcoderoi-f2f += "${bindir}/runBarcodeRoiSave2File.sh"
+FILES:matrix-machinevision-demo-barcoderoi    = "${MATRIX_APP_DIR}/machinevision_barcode_roi/*"
+FILES:matrix-machinevision-demo-barcoderoi   += "${bindir}/runBarcodeRoi.sh"
+FILES:matrix-machinevision-demo-barcoderoi-f2f = "${MATRIX_APP_DIR}/machinevision_barcode_roi_f2f/*"
+FILES:matrix-machinevision-demo-barcoderoi-f2f += "${bindir}/runBarcodeRoiSave2File.sh"
 
-FILES_matrix-machinevision-demo-simplepeopletracking   = "${MATRIX_APP_DIR}/machinevision_simple_people_tracking/*"
-FILES_matrix-machinevision-demo-simplepeopletracking   += "${bindir}/runSimplePeopleTracking.sh"
+FILES:matrix-machinevision-demo-simplepeopletracking   = "${MATRIX_APP_DIR}/machinevision_simple_people_tracking/*"
+FILES:matrix-machinevision-demo-simplepeopletracking   += "${bindir}/runSimplePeopleTracking.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
index 340c5144..d20143e6 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-mc-demos_2.0.bb
@@ -15,13 +15,13 @@ PACKAGES = "matrix-mc-demo-ipc \
             matrix-mc-demo-imageproc \
 "
 
-RDEPENDS_matrix-mc-demo-ipc        = "${MC_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-mc-demo-imageproc  = "${MC_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-mc-demo-ipc        = "${MC_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-mc-demo-imageproc  = "${MC_DEMOS_RDEPENDS}"
 
-FILES_matrix-mc-demo-ipc        = "${MATRIX_APP_DIR}/mc_demo_ipc/*"
-FILES_matrix-mc-demo-imageproc  = "${MATRIX_APP_DIR}/mc_demo_imageproc/*"
+FILES:matrix-mc-demo-ipc        = "${MATRIX_APP_DIR}/mc_demo_ipc/*"
+FILES:matrix-mc-demo-imageproc  = "${MATRIX_APP_DIR}/mc_demo_imageproc/*"
 
-FILES_matrix-mc-demo-ipc       += "${bindir}/mc_demo_ipc.sh"
-FILES_matrix-mc-demo-imageproc += "${bindir}/mc_demo_imageproc.sh \
+FILES:matrix-mc-demo-ipc       += "${bindir}/mc_demo_ipc.sh"
+FILES:matrix-mc-demo-imageproc += "${bindir}/mc_demo_imageproc.sh \
                                    ${bindir}/mc_run_dsp.sh \
 "
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
index 701dd20b..3bfbc540 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-multimedia-demos_2.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git/multimedia_apps"
 # Make sure multimedia submenu and app images has been installed
 MULTIMEDIA_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-multimedia amsdk-av-files"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-multimedia-demo-aac \
             matrix-multimedia-demo-audiocapture \
@@ -27,44 +27,44 @@ PACKAGES = "matrix-multimedia-demo-aac \
             matrix-multimedia-demo-dsp66imgproc-f2f \
 "
 
-RDEPENDS_matrix-multimedia-demo-aac = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-audiocapture = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-h264dec      = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-mpeg4aacdec   = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-mpeg4dec     = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-ivahdh264dec             = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-ivahdh264enc             = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-ivahdmjpegenc            = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-h265dec      = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-dsp66imgproc  = "${MULTIMEDIA_RDEPENDS}"
-RDEPENDS_matrix-multimedia-demo-dsp66imgproc-f2f  = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-aac = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-audiocapture = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-h264dec      = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-mpeg4aacdec   = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-mpeg4dec     = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-ivahdh264dec             = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-ivahdh264enc             = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-ivahdmjpegenc            = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-h265dec      = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-dsp66imgproc  = "${MULTIMEDIA_RDEPENDS}"
+RDEPENDS:matrix-multimedia-demo-dsp66imgproc-f2f  = "${MULTIMEDIA_RDEPENDS}"
 
 
 # Split the matrix files by multimedia demos
-FILES_matrix-multimedia-demo-aac = "${MATRIX_APP_DIR}/arm_multimedia_aacdec/*"
-FILES_matrix-multimedia-demo-audiocapture = "${MATRIX_APP_DIR}/arm_multimedia_audiocapture/*"
-FILES_matrix-multimedia-demo-h264dec      = "${MATRIX_APP_DIR}/arm_multimedia_h264dec/*"
-FILES_matrix-multimedia-demo-mpeg4aacdec   = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4aacdec/*"
-FILES_matrix-multimedia-demo-mpeg4dec     = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4dec/*"
-FILES_matrix-multimedia-demo-ivahdh264dec                = "${MATRIX_APP_DIR}/ivahd_multimedia_h264dec/*"
-FILES_matrix-multimedia-demo-ivahdh264enc                = "${MATRIX_APP_DIR}/ivahd_multimedia_h264enc/*"
-FILES_matrix-multimedia-demo-ivahdmjpegenc               = "${MATRIX_APP_DIR}/ivahd_multimedia_mjpegenc/*"
-FILES_matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec    = "${MATRIX_APP_DIR}/ivahd_multimedia_vip_vpe_mpeg4encdec/*"
-FILES_matrix-multimedia-demo-h265dec      = "${MATRIX_APP_DIR}/arm_multimedia_h265dec/*"
-FILES_matrix-multimedia-demo-dsp66imgproc     = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc/*"
-FILES_matrix-multimedia-demo-dsp66imgproc-f2f     = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc_f2f/*"
+FILES:matrix-multimedia-demo-aac = "${MATRIX_APP_DIR}/arm_multimedia_aacdec/*"
+FILES:matrix-multimedia-demo-audiocapture = "${MATRIX_APP_DIR}/arm_multimedia_audiocapture/*"
+FILES:matrix-multimedia-demo-h264dec      = "${MATRIX_APP_DIR}/arm_multimedia_h264dec/*"
+FILES:matrix-multimedia-demo-mpeg4aacdec   = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4aacdec/*"
+FILES:matrix-multimedia-demo-mpeg4dec     = "${MATRIX_APP_DIR}/arm_multimedia_mpeg4dec/*"
+FILES:matrix-multimedia-demo-ivahdh264dec                = "${MATRIX_APP_DIR}/ivahd_multimedia_h264dec/*"
+FILES:matrix-multimedia-demo-ivahdh264enc                = "${MATRIX_APP_DIR}/ivahd_multimedia_h264enc/*"
+FILES:matrix-multimedia-demo-ivahdmjpegenc               = "${MATRIX_APP_DIR}/ivahd_multimedia_mjpegenc/*"
+FILES:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec    = "${MATRIX_APP_DIR}/ivahd_multimedia_vip_vpe_mpeg4encdec/*"
+FILES:matrix-multimedia-demo-h265dec      = "${MATRIX_APP_DIR}/arm_multimedia_h265dec/*"
+FILES:matrix-multimedia-demo-dsp66imgproc     = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc/*"
+FILES:matrix-multimedia-demo-dsp66imgproc-f2f     = "${MATRIX_APP_DIR}/dsp66_multimedia_imgproc_f2f/*"
 
 # Split the ${bindir} files by multimedia demos
-FILES_matrix-multimedia-demo-aac += "${bindir}/runAACDec.sh"
-FILES_matrix-multimedia-demo-audiocapture += "${bindir}/runAudioCapture.sh"
-FILES_matrix-multimedia-demo-h264dec      += "${bindir}/runH264Dec.sh"
-FILES_matrix-multimedia-demo-mpeg4aacdec   += "${bindir}/runMpeg4AacDec.sh"
-FILES_matrix-multimedia-demo-mpeg4dec     += "${bindir}/runMpeg4Dec.sh"
-FILES_matrix-multimedia-demo-ivahdh264dec               += "${bindir}/runIvahdH264Dec.sh"
-FILES_matrix-multimedia-demo-ivahdh264enc               += "${bindir}/runIvahdH264Enc.sh"
-FILES_matrix-multimedia-demo-ivahdmjpegenc              += "${bindir}/runIvahdMjpegEnc.sh"
-FILES_matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec   += "${bindir}/runIvahdVipVpeMpeg4EncDec.sh"
-FILES_matrix-multimedia-demo-h265dec      += "${bindir}/runH265Dec.sh"
-FILES_matrix-multimedia-demo-dsp66imgproc    += "${bindir}/runDsp66ImgProc.sh"
-FILES_matrix-multimedia-demo-dsp66imgproc-f2f    += "${bindir}/runDsp66ImgProcSave2File.sh"
+FILES:matrix-multimedia-demo-aac += "${bindir}/runAACDec.sh"
+FILES:matrix-multimedia-demo-audiocapture += "${bindir}/runAudioCapture.sh"
+FILES:matrix-multimedia-demo-h264dec      += "${bindir}/runH264Dec.sh"
+FILES:matrix-multimedia-demo-mpeg4aacdec   += "${bindir}/runMpeg4AacDec.sh"
+FILES:matrix-multimedia-demo-mpeg4dec     += "${bindir}/runMpeg4Dec.sh"
+FILES:matrix-multimedia-demo-ivahdh264dec               += "${bindir}/runIvahdH264Dec.sh"
+FILES:matrix-multimedia-demo-ivahdh264enc               += "${bindir}/runIvahdH264Enc.sh"
+FILES:matrix-multimedia-demo-ivahdmjpegenc              += "${bindir}/runIvahdMjpegEnc.sh"
+FILES:matrix-multimedia-demo-vip-vpe-ivahdmpeg4encdec   += "${bindir}/runIvahdVipVpeMpeg4EncDec.sh"
+FILES:matrix-multimedia-demo-h265dec      += "${bindir}/runH265Dec.sh"
+FILES:matrix-multimedia-demo-dsp66imgproc    += "${bindir}/runDsp66ImgProc.sh"
+FILES:matrix-multimedia-demo-dsp66imgproc-f2f    += "${bindir}/runDsp66ImgProcSave2File.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
index a2eba7b5..b0f38e16 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb
@@ -13,24 +13,24 @@ S = "${WORKDIR}/git/opencl_apps"
 # Make sure opencl submenu and app images has been installed
 OPENCL_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-opencl"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-opencl-demo-dsplibfft  \
             matrix-opencl-demo-vecadd     \
             matrix-opencl-demo-floatcompute \
 "
 
-RDEPENDS_matrix-opencl-demo-dsplibfft     = "${OPENCL_RDEPENDS}"
-RDEPENDS_matrix-opencl-demo-vecadd        = "${OPENCL_RDEPENDS}"
-RDEPENDS_matrix-opencl-demo-floatcompute  = "${OPENCL_RDEPENDS}"
+RDEPENDS:matrix-opencl-demo-dsplibfft     = "${OPENCL_RDEPENDS}"
+RDEPENDS:matrix-opencl-demo-vecadd        = "${OPENCL_RDEPENDS}"
+RDEPENDS:matrix-opencl-demo-floatcompute  = "${OPENCL_RDEPENDS}"
 
 # Split the matrix files by opencl demos
-FILES_matrix-opencl-demo-dsplibfft     = "${MATRIX_APP_DIR}/opencl_dsplib_fft/*"
-FILES_matrix-opencl-demo-vecadd        = "${MATRIX_APP_DIR}/opencl_vecadd/*"
-FILES_matrix-opencl-demo-floatcompute  = "${MATRIX_APP_DIR}/opencl_float_compute/*"
+FILES:matrix-opencl-demo-dsplibfft     = "${MATRIX_APP_DIR}/opencl_dsplib_fft/*"
+FILES:matrix-opencl-demo-vecadd        = "${MATRIX_APP_DIR}/opencl_vecadd/*"
+FILES:matrix-opencl-demo-floatcompute  = "${MATRIX_APP_DIR}/opencl_float_compute/*"
 
 
 # Split the ${bindir} files by opencl demos
-FILES_matrix-opencl-demo-dsplibfft     += "${bindir}/runOclDsplibFFT.sh"
-FILES_matrix-opencl-demo-vecadd        += "${bindir}/runOclVecadd.sh"
-FILES_matrix-opencl-demo-floatcompute  += "${bindir}/runOclFloatCompute.sh"
+FILES:matrix-opencl-demo-dsplibfft     += "${bindir}/runOclDsplibFFT.sh"
+FILES:matrix-opencl-demo-vecadd        += "${bindir}/runOclVecadd.sh"
+FILES:matrix-opencl-demo-floatcompute  += "${bindir}/runOclFloatCompute.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
index 6411c45f..2235b49f 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-oprofile-demos_2.0.bb
@@ -11,6 +11,6 @@ S = "${WORKDIR}/git/oprofile_apps"
 # Make sure profiling submenu and app images  has been installed
 # Include am-sysinfo because that package has the sample
 # executables for profiling.
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-oprofile oprofile oprofile-example"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-oprofile oprofile oprofile-example"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
index a9ebb84f..3daffbd5 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-pm-demos_2.0.bb
@@ -9,8 +9,8 @@ inherit allarch
 S = "${WORKDIR}/git/power_apps"
 
 # Make sure power submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
-ALLOW_EMPTY_${PN} = "1"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-power matrix-gui-generic-pm"
+ALLOW_EMPTY:${PN} = "1"
 
 # Break out the individual files into separate packages.  That way only the
 # PM features supported for each device can be installed.  Prepend the list
@@ -18,18 +18,18 @@ ALLOW_EMPTY_${PN} = "1"
 PACKAGES =+ "${PN}-count ${PN}-dump-reg ${PN}-snapshot1 ${PN}-snapshot2 ${PN}-suspend ${PN}-governor"
 
 # Split the matrix files by PM app
-FILES_${PN}-count += "${MATRIX_APP_DIR}/pm_count/*"
-FILES_${PN}-dump-reg += "${MATRIX_APP_DIR}/pm_dump_reg/*"
-FILES_${PN}-snapshot1 += "${MATRIX_APP_DIR}/pm_snapshot_1/*"
-FILES_${PN}-snapshot2 += "${MATRIX_APP_DIR}/pm_snapshot_2/*"
-FILES_${PN}-suspend += "${MATRIX_APP_DIR}/pm_suspend/*"
-FILES_${PN}-governor += "${MATRIX_APP_DIR}/pm_userspace_governor/* \
+FILES:${PN}-count += "${MATRIX_APP_DIR}/pm_count/*"
+FILES:${PN}-dump-reg += "${MATRIX_APP_DIR}/pm_dump_reg/*"
+FILES:${PN}-snapshot1 += "${MATRIX_APP_DIR}/pm_snapshot_1/*"
+FILES:${PN}-snapshot2 += "${MATRIX_APP_DIR}/pm_snapshot_2/*"
+FILES:${PN}-suspend += "${MATRIX_APP_DIR}/pm_suspend/*"
+FILES:${PN}-governor += "${MATRIX_APP_DIR}/pm_userspace_governor/* \
                          ${MATRIX_APP_DIR}/pm_ondemand_governor/*"
 
 # Split the ${bindir} files by PM app
-FILES_${PN}-count += "${bindir}/pm_count.sh"
-FILES_${PN}-dump-reg += "${bindir}/pm_dump_reg.sh"
-FILES_${PN}-snapshot1 += "${bindir}/pm_snapshot_1.sh"
-FILES_${PN}-snapshot2 += "${bindir}/pm_snapshot_2.sh"
-FILES_${PN}-suspend += "${bindir}/pm_suspend.sh"
-FILES_${PN}-governor += "${bindir}/setgovernor.sh"
+FILES:${PN}-count += "${bindir}/pm_count.sh"
+FILES:${PN}-dump-reg += "${bindir}/pm_dump_reg.sh"
+FILES:${PN}-snapshot1 += "${bindir}/pm_snapshot_1.sh"
+FILES:${PN}-snapshot2 += "${bindir}/pm_snapshot_2.sh"
+FILES:${PN}-suspend += "${bindir}/pm_suspend.sh"
+FILES:${PN}-governor += "${bindir}/setgovernor.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
index e95409d9..afae3424 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-pru-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/pru_apps"
 
 # Make sure pru submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-pru"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-pru"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
index 081bde7d..ed0da382 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt4-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/qt4_apps"
 
 # Make sure qt4 submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-qt4"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-qt4"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
index f9b1e8fc..c5084c49 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git/qt5_apps"
 # Make sure qt5 submenu and app images has been installed
 QT5_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-qt5"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 PACKAGES = "matrix-qt5-demo-animated \
             matrix-qt5-demo-browser \
             matrix-qt5-demo-calculator \
@@ -19,15 +19,15 @@ PACKAGES = "matrix-qt5-demo-animated \
             matrix-qt5-demo-webkit-browser \
 "
 
-RDEPENDS_matrix-qt5-demo-animated = "${QT5_RDEPENDS}"
-RDEPENDS_matrix-qt5-demo-browser = "${QT5_RDEPENDS}"
-RDEPENDS_matrix-qt5-demo-calculator = "${QT5_RDEPENDS}"
-RDEPENDS_matrix-qt5-demo-deform = "${QT5_RDEPENDS}"
-RDEPENDS_matrix-qt5-demo-webkit-browser = "${QT5_RDEPENDS}"
+RDEPENDS:matrix-qt5-demo-animated = "${QT5_RDEPENDS}"
+RDEPENDS:matrix-qt5-demo-browser = "${QT5_RDEPENDS}"
+RDEPENDS:matrix-qt5-demo-calculator = "${QT5_RDEPENDS}"
+RDEPENDS:matrix-qt5-demo-deform = "${QT5_RDEPENDS}"
+RDEPENDS:matrix-qt5-demo-webkit-browser = "${QT5_RDEPENDS}"
 
 # Split the matrix files by qt5 demos
-FILES_matrix-qt5-demo-animated = "${MATRIX_APP_DIR}/qt5_animated_tiles/*"
-FILES_matrix-qt5-demo-browser = "${MATRIX_APP_DIR}/qt5_browser/*"
-FILES_matrix-qt5-demo-calculator = "${MATRIX_APP_DIR}/qt5_calculator/*"
-FILES_matrix-qt5-demo-deform = "${MATRIX_APP_DIR}/qt5_deform/*"
-FILES_matrix-qt5-demo-webkit-browser = "${MATRIX_APP_DIR}/qt5_webkit_browser/*"
+FILES:matrix-qt5-demo-animated = "${MATRIX_APP_DIR}/qt5_animated_tiles/*"
+FILES:matrix-qt5-demo-browser = "${MATRIX_APP_DIR}/qt5_browser/*"
+FILES:matrix-qt5-demo-calculator = "${MATRIX_APP_DIR}/qt5_calculator/*"
+FILES:matrix-qt5-demo-deform = "${MATRIX_APP_DIR}/qt5_deform/*"
+FILES:matrix-qt5-demo-webkit-browser = "${MATRIX_APP_DIR}/qt5_webkit_browser/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
index 80f5a1f5..5a26ae24 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
@@ -17,8 +17,8 @@ SETTINGS_DEMOS_RDEPENDS = " \
     am-sysinfo \
 "
 
-RDEPENDS_${PN} += "${SETTINGS_DEMOS_RDEPENDS}"
-RDEPENDS_matrix-gui-weston-terminal-demo += "${SETTINGS_DEMOS_RDEPENDS}"
+RDEPENDS:${PN} += "${SETTINGS_DEMOS_RDEPENDS}"
+RDEPENDS:matrix-gui-weston-terminal-demo += "${SETTINGS_DEMOS_RDEPENDS}"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
-FILES_matrix-gui-weston-terminal-demo = "${MATRIX_APP_DIR}/terminal"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:matrix-gui-weston-terminal-demo = "${MATRIX_APP_DIR}/terminal"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
index dce40212..71714ef2 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
@@ -76,31 +76,31 @@ PACKAGES += " ${PN}-arm \
 "
 
 # Make sure app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images bash"
+RDEPENDS:${PN} += "matrix-gui-apps-images bash"
 
 # Add the files for each submenu package
-FILES_${PN}-arm = "${MATRIX_APP_DIR}/arm_submenu/*"
-FILES_${PN}-3d = "${MATRIX_APP_DIR}/3d_submenu/*"
-FILES_${PN}-cryptos = "${MATRIX_APP_DIR}/cryptos_submenu/*"
-FILES_${PN}-display = "${MATRIX_APP_DIR}/display_submenu/*"
-FILES_${PN}-ethernet = "${MATRIX_APP_DIR}/ethernet_submenu/*"
-FILES_${PN}-multimedia = "${MATRIX_APP_DIR}/multimedia_submenu/*"
-FILES_${PN}-power = "${MATRIX_APP_DIR}/power_submenu/*"
-FILES_${PN}-pru = "${MATRIX_APP_DIR}/pru_submenu/*"
-FILES_${PN}-qt4 = "${MATRIX_APP_DIR}/qt4_submenu/*"
-FILES_${PN}-qt5 = "${MATRIX_APP_DIR}/qt5_submenu/*"
-FILES_${PN}-settings = "${MATRIX_APP_DIR}/settings_submenu/*"
-FILES_${PN}-usb = "${MATRIX_APP_DIR}/usb_submenu/*"
-FILES_${PN}-wifi = "${MATRIX_APP_DIR}/wifi_submenu/*"
-FILES_${PN}-oprofile = "${MATRIX_APP_DIR}/oprofile_submenu/*"
-FILES_${PN}-camera = "${MATRIX_APP_DIR}/camera_submenu/*"
-FILES_${PN}-utility = "${MATRIX_APP_DIR}/utilities_submenu/*"
-FILES_${PN}-mc-demo = "${MATRIX_APP_DIR}/mc_demo_submenu/*"
-FILES_${PN}-opencl = "${MATRIX_APP_DIR}/opencl_submenu/*"
-FILES_${PN}-videoanalytics = "${MATRIX_APP_DIR}/videoanalytics_submenu/*"
-FILES_${PN}-machinevision = "${MATRIX_APP_DIR}/machinevision_submenu/*"
-FILES_${PN}-touch = "${MATRIX_APP_DIR}/touch_submenu/*"
-FILES_${PN}-browser = "${MATRIX_APP_DIR}/browser_submenu/*"
-FILES_${PN}-hmi = "${MATRIX_APP_DIR}/hmi_submenu/*"
-FILES_${PN}-tidl = "${MATRIX_APP_DIR}/tidl_submenu/*"
-FILES_${PN}-analytics = "${MATRIX_APP_DIR}/analytics_submenu/*"
+FILES:${PN}-arm = "${MATRIX_APP_DIR}/arm_submenu/*"
+FILES:${PN}-3d = "${MATRIX_APP_DIR}/3d_submenu/*"
+FILES:${PN}-cryptos = "${MATRIX_APP_DIR}/cryptos_submenu/*"
+FILES:${PN}-display = "${MATRIX_APP_DIR}/display_submenu/*"
+FILES:${PN}-ethernet = "${MATRIX_APP_DIR}/ethernet_submenu/*"
+FILES:${PN}-multimedia = "${MATRIX_APP_DIR}/multimedia_submenu/*"
+FILES:${PN}-power = "${MATRIX_APP_DIR}/power_submenu/*"
+FILES:${PN}-pru = "${MATRIX_APP_DIR}/pru_submenu/*"
+FILES:${PN}-qt4 = "${MATRIX_APP_DIR}/qt4_submenu/*"
+FILES:${PN}-qt5 = "${MATRIX_APP_DIR}/qt5_submenu/*"
+FILES:${PN}-settings = "${MATRIX_APP_DIR}/settings_submenu/*"
+FILES:${PN}-usb = "${MATRIX_APP_DIR}/usb_submenu/*"
+FILES:${PN}-wifi = "${MATRIX_APP_DIR}/wifi_submenu/*"
+FILES:${PN}-oprofile = "${MATRIX_APP_DIR}/oprofile_submenu/*"
+FILES:${PN}-camera = "${MATRIX_APP_DIR}/camera_submenu/*"
+FILES:${PN}-utility = "${MATRIX_APP_DIR}/utilities_submenu/*"
+FILES:${PN}-mc-demo = "${MATRIX_APP_DIR}/mc_demo_submenu/*"
+FILES:${PN}-opencl = "${MATRIX_APP_DIR}/opencl_submenu/*"
+FILES:${PN}-videoanalytics = "${MATRIX_APP_DIR}/videoanalytics_submenu/*"
+FILES:${PN}-machinevision = "${MATRIX_APP_DIR}/machinevision_submenu/*"
+FILES:${PN}-touch = "${MATRIX_APP_DIR}/touch_submenu/*"
+FILES:${PN}-browser = "${MATRIX_APP_DIR}/browser_submenu/*"
+FILES:${PN}-hmi = "${MATRIX_APP_DIR}/hmi_submenu/*"
+FILES:${PN}-tidl = "${MATRIX_APP_DIR}/tidl_submenu/*"
+FILES:${PN}-analytics = "${MATRIX_APP_DIR}/analytics_submenu/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
index f05dd4c8..dd80d087 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tidl-demos_2.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git/tidl_apps"
 # Make sure tidl submenu and app images has been installed
 TIDLDEMO_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-tidl"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
 
 PACKAGES = "matrix-tidl-demo-staticimg \
             matrix-tidl-demo-staticimg-lg2 \
@@ -25,72 +25,72 @@ PACKAGES = "matrix-tidl-demo-staticimg \
             matrix-tidl-demo-segment \
 "
 
-RDEPENDS_matrix-tidl-demo-staticimg = " \
+RDEPENDS:matrix-tidl-demo-staticimg = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-staticimg-lg2 = " \
+RDEPENDS:matrix-tidl-demo-staticimg-lg2 = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-staticimg-dsponly = " \
+RDEPENDS:matrix-tidl-demo-staticimg-dsponly = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-pnexamples = " \
+RDEPENDS:matrix-tidl-demo-pnexamples = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-livecam = " \
+RDEPENDS:matrix-tidl-demo-livecam = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-livecam-lg2 = " \
+RDEPENDS:matrix-tidl-demo-livecam-lg2 = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-dogbreeds = " \
+RDEPENDS:matrix-tidl-demo-dogbreeds = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-objdet = " \
+RDEPENDS:matrix-tidl-demo-objdet = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-objdet-livecam = " \
+RDEPENDS:matrix-tidl-demo-objdet-livecam = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-RDEPENDS_matrix-tidl-demo-segment = " \
+RDEPENDS:matrix-tidl-demo-segment = " \
     ${TIDLDEMO_RDEPENDS} \
 "
 
-FILES_matrix-tidl-demo-staticimg = "${MATRIX_APP_DIR}/tidl_demo_staticimg/*"
-FILES_matrix-tidl-demo-staticimg += "${bindir}/runTidlStaticImg.sh"
+FILES:matrix-tidl-demo-staticimg = "${MATRIX_APP_DIR}/tidl_demo_staticimg/*"
+FILES:matrix-tidl-demo-staticimg += "${bindir}/runTidlStaticImg.sh"
 
-FILES_matrix-tidl-demo-staticimg-lg2 = "${MATRIX_APP_DIR}/tidl_demo_staticimg_lg2/*"
-FILES_matrix-tidl-demo-staticimg-lg2 += "${bindir}/runTidlStaticImg_lg2.sh"
+FILES:matrix-tidl-demo-staticimg-lg2 = "${MATRIX_APP_DIR}/tidl_demo_staticimg_lg2/*"
+FILES:matrix-tidl-demo-staticimg-lg2 += "${bindir}/runTidlStaticImg_lg2.sh"
 
-FILES_matrix-tidl-demo-staticimg-dsponly = "${MATRIX_APP_DIR}/tidl_demo_staticimg_dsponly/*"
-FILES_matrix-tidl-demo-staticimg-dsponly += "${bindir}/runTidlStaticImg_dsponly.sh"
+FILES:matrix-tidl-demo-staticimg-dsponly = "${MATRIX_APP_DIR}/tidl_demo_staticimg_dsponly/*"
+FILES:matrix-tidl-demo-staticimg-dsponly += "${bindir}/runTidlStaticImg_dsponly.sh"
 
-FILES_matrix-tidl-demo-pnexamples = "${MATRIX_APP_DIR}/tidl_demo_pnexamples/*"
-FILES_matrix-tidl-demo-pnexamples += "${bindir}/runTidlPnExamples.sh"
+FILES:matrix-tidl-demo-pnexamples = "${MATRIX_APP_DIR}/tidl_demo_pnexamples/*"
+FILES:matrix-tidl-demo-pnexamples += "${bindir}/runTidlPnExamples.sh"
 
-FILES_matrix-tidl-demo-livecam   = "${MATRIX_APP_DIR}/tidl_demo_livecam/*"
-FILES_matrix-tidl-demo-livecam   += "${bindir}/runTidlLiveCam.sh"
+FILES:matrix-tidl-demo-livecam   = "${MATRIX_APP_DIR}/tidl_demo_livecam/*"
+FILES:matrix-tidl-demo-livecam   += "${bindir}/runTidlLiveCam.sh"
 
-FILES_matrix-tidl-demo-livecam-lg2  = "${MATRIX_APP_DIR}/tidl_demo_livecam_lg2/*"
-FILES_matrix-tidl-demo-livecam-lg2  += "${bindir}/runTidlLiveCam_lg2.sh"
+FILES:matrix-tidl-demo-livecam-lg2  = "${MATRIX_APP_DIR}/tidl_demo_livecam_lg2/*"
+FILES:matrix-tidl-demo-livecam-lg2  += "${bindir}/runTidlLiveCam_lg2.sh"
 
-FILES_matrix-tidl-demo-dogbreeds = "${MATRIX_APP_DIR}/tidl_demo_dogbreeds/*"
-FILES_matrix-tidl-demo-dogbreeds += "${bindir}/runTidlDogBreeds.sh"
+FILES:matrix-tidl-demo-dogbreeds = "${MATRIX_APP_DIR}/tidl_demo_dogbreeds/*"
+FILES:matrix-tidl-demo-dogbreeds += "${bindir}/runTidlDogBreeds.sh"
 
-FILES_matrix-tidl-demo-objdet   = "${MATRIX_APP_DIR}/tidl_demo_objdet/*"
-FILES_matrix-tidl-demo-objdet   += "${bindir}/runTidlObjdet.sh"
+FILES:matrix-tidl-demo-objdet   = "${MATRIX_APP_DIR}/tidl_demo_objdet/*"
+FILES:matrix-tidl-demo-objdet   += "${bindir}/runTidlObjdet.sh"
 
-FILES_matrix-tidl-demo-objdet-livecam   = "${MATRIX_APP_DIR}/tidl_demo_objdet_livecam/*"
-FILES_matrix-tidl-demo-objdet-livecam   += "${bindir}/runTidlObjdet_livecam.sh"
+FILES:matrix-tidl-demo-objdet-livecam   = "${MATRIX_APP_DIR}/tidl_demo_objdet_livecam/*"
+FILES:matrix-tidl-demo-objdet-livecam   += "${bindir}/runTidlObjdet_livecam.sh"
 
-FILES_matrix-tidl-demo-segment   = "${MATRIX_APP_DIR}/tidl_demo_segment/*"
-FILES_matrix-tidl-demo-segment   += "${bindir}/runTidlSegment.sh"
+FILES:matrix-tidl-demo-segment   = "${MATRIX_APP_DIR}/tidl_demo_segment/*"
+FILES:matrix-tidl-demo-segment   += "${bindir}/runTidlSegment.sh"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
index 99fd3951..8e4ba444 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/touch_apps"
 
 # Make sure touch submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-touch"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-touch"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
index 404b037a..de6c8e4a 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-usb-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/usb_apps"
 
 # Make sure usb submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-usb bonnie++ matrix-gui-helper-scripts"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-usb bonnie++ matrix-gui-helper-scripts"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
index 8cb6cf29..44653d01 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-utility-demos_2.0.bb
@@ -8,7 +8,7 @@ inherit allarch
 
 S = "${WORKDIR}/git/utilities_apps"
 
-do_install_prepend(){
+do_install:prepend(){
    install -d ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_eeprom/eeprom ${D}${MATRIX_BASE_DIR}/html-apps/
    cp -rf ${S}/utility_filesystem/filesystem ${D}${MATRIX_BASE_DIR}/html-apps/
@@ -16,7 +16,7 @@ do_install_prepend(){
    cp -rf ${S}/utility_stats/stats ${D}${MATRIX_BASE_DIR}/html-apps/
 }
 
-do_install_append(){
+do_install:append(){
     rm ${D}${MATRIX_APP_DIR}/utility_eeprom/eeprom-utility.php
     rm ${D}${MATRIX_APP_DIR}/utility_filesystem/filesystem-utility.php
     rm ${D}${MATRIX_APP_DIR}/utility_info/info-utility.php
@@ -24,8 +24,8 @@ do_install_append(){
 }
 
 # Make sure utility submenu and app images has been installed.
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-utility"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-utility"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
+FILES:${PN} += "${MATRIX_BASE_DIR}/html-apps/ \
                 ${MATRIX_BASE_DIR}/apps/ \
 "
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
index 1dd0d950..79360796 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-v4l2-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/v4l2_apps"
 
 # Make sure display submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-display av-examples"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-display av-examples"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
index 4c900506..d0cf5233 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb
@@ -18,11 +18,11 @@ PACKAGES = "matrix-video-analytics-opencv-opencl-opengl-demo \
 "
 
 #    ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]}
-RDEPENDS_matrix-video-analytics-opencv-opencl-opengl-demo = " \
+RDEPENDS:matrix-video-analytics-opencv-opencl-opengl-demo = " \
     ${VIDEO_ANALYTICS_DEMO_RDEPENDS} \
 "
 
 # Split the matrix files by demos
-FILES_matrix-video-analytics-opencv-opencl-opengl-demo = " \
+FILES:matrix-video-analytics-opencv-opencl-opengl-demo = " \
     ${MATRIX_APP_DIR}/videoanalytics_opencv_opencl_opengl_demo/* \
 "
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
index b5060ace..2c77953b 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-wifi-demos_2.0.bb
@@ -9,6 +9,6 @@ inherit allarch
 S = "${WORKDIR}/git/wifi_apps"
 
 # Make sure wifi submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-wifi"
+RDEPENDS:${PN} += "matrix-gui-apps-images matrix-gui-submenus-wifi"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini b/meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini
index 900a86b8..350e6122 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/php.ini
@@ -502,7 +502,7 @@ magic_quotes_runtime = Off
 magic_quotes_sybase = Off
 
 ; Automatically add files before or after any PHP document.
-auto_prepend_file =
+auto:prepend_file =
 auto_append_file =
 
 ; As of 4.0b4, PHP always outputs a character encoding by default in
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 4c9c5386..7cd5c82e 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -7,7 +7,7 @@ SECTION = "multimedia"
 
 PR = "r37"
 
-SYSTEMD_SERVICE_${PN} = "matrix-gui-2.0.service"
+SYSTEMD_SERVICE:${PN} = "matrix-gui-2.0.service"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -58,6 +58,6 @@ do_install(){
 
 GUIDEPS = "${@bb.utils.contains('MACHINE_FEATURES','gpu',"matrix-gui-browser refresh-screen",'',d)}"
 
-RDEPENDS_${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-deflate lighttpd-module-expire php php-cgi php-cli ${GUIDEPS}"
+RDEPENDS:${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-deflate lighttpd-module-expire php php-cgi php-cli ${GUIDEPS}"
 
-FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES:${PN} += "${MATRIX_BASE_DIR}/*"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
index 8a89aa3b..95f75b52 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
@@ -19,10 +19,10 @@ do_install() {
 	install -m 0644 ${WORKDIR}/lighttpd.conf.matrix ${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix
 }
 
-FILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf.matrix"
-RDEPENDS_${PN} = "lighttpd lighttpd-module-setenv"
+FILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf.matrix"
+RDEPENDS:${PN} = "lighttpd lighttpd-module-setenv"
 
-pkg_postinst_ontarget_${PN} () {
+pkg_postinst_ontarget:${PN} () {
 if [ -f ${sysconfdir}/lighttpd/lighttpd.conf ] ; then
 	cp ${sysconfdir}/lighttpd/lighttpd.conf.matrix ${sysconfdir}/lighttpd/lighttpd.conf
 else
diff --git a/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb b/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
index e4323891..bbae8622 100644
--- a/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
+++ b/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
@@ -17,9 +17,9 @@ EXCLUDE_FROM_SHLIBS = "1"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-INSANE_SKIP_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so staticdev file-rdeps"
-INSANE_SKIP_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so file-rdeps"
-INSANE_SKIP_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so file-rdeps"
+INSANE_SKIP:gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so staticdev file-rdeps"
+INSANE_SKIP:gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so file-rdeps"
+INSANE_SKIP:binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "dev-so file-rdeps"
 
 PROVIDES = "\
 	gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \
@@ -40,7 +40,7 @@ libexecdir = "${exec_prefix}/libexec"
 datadir = "${exec_prefix}/share"
 gcclibdir = "${libdir}/gcc"
 
-FILES_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
+FILES:gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${prefix}/${EAT_TARGET_SYS}/lib/libstdc++.* \
 	${prefix}/${EAT_TARGET_SYS}/lib/libgcc_s.* \
 	${prefix}/${EAT_TARGET_SYS}/lib/libsupc++.* \
@@ -52,7 +52,7 @@ FILES_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${libexecdir}/* \
 "
 
-FILES_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
+FILES:gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${bindir}/${TARGET_PREFIX}gdb \
 	${bindir}/${TARGET_PREFIX}gdbtui \
 	${datadir}/gdb/* \
@@ -60,7 +60,7 @@ FILES_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${datadir}/man/man1/${TARGET_PREFIX}* \
 "
 
-FILES_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
+FILES:binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${prefix}/${EAT_TARGET_SYS}/bin/ld* \
 	${prefix}/${EAT_TARGET_SYS}/bin/objcopy \
 	${prefix}/${EAT_TARGET_SYS}/bin/strip \
@@ -86,22 +86,22 @@ FILES_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "\
 	${bindir}/${TARGET_PREFIX}size \
 "
 
-DESCRIPTION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "The GNU cc and gcc C compilers"
-DESCRIPTION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb - GNU debugger"
-DESCRIPTION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "A GNU collection of binary utilities"
+DESCRIPTION:gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "The GNU cc and gcc C compilers"
+DESCRIPTION:gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb - GNU debugger"
+DESCRIPTION:binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "A GNU collection of binary utilities"
 
 #LICENSE = "${ARG_LIC_LIBC}"
-#LICENSE_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_GCC}"
-#LICENSE_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_GDB}"
-#LICENSE_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_BFD}"
+#LICENSE:gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_GCC}"
+#LICENSE:gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_GDB}"
+#LICENSE:binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${ARG_LIC_BFD}"
 
 PKGV = "${EAT_VER_MAIN}"
-PKGV_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_GCC}"
-PKGV_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_GDB}"
-PKGV_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_BFD}"
+PKGV:gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_GCC}"
+PKGV:gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_GDB}"
+PKGV:binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${EAT_VER_BFD}"
 
 LIBDIR = "lib"
-LIBDIR_aarch64 = "lib64"
+LIBDIR:aarch64 = "lib64"
 
 do_install() {
 	install -d ${D}${prefix}/${EAT_TARGET_SYS}/bin
diff --git a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
index 5a51aaa0..478ba2ba 100644
--- a/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend
@@ -1,6 +1,6 @@
 ORIG_TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}"
 
-do_install_append() {
+do_install:append() {
 	install -d ${D}${base_sbindir}
 	cp -a ${TOOLCHAIN_PATH}/${EAT_TARGET_SYS}/libc/${base_sbindir}/ldconfig ${D}${base_sbindir}/
 	install -d ${D}${sysconfdir}
@@ -25,11 +25,11 @@ do_install_append() {
 	cp ${CP_ARGS} ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcc* ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
 }
 
-# Below FILES_* overrides are due to TARGET_SYS -> ORIG_TARGET_SYS move in ${libdir}/gcc
+# Below FILES:* overrides are due to TARGET_SYS -> ORIG_TARGET_SYS move in ${libdir}/gcc
 # to enable native compile on the target
-FILES_libgcov-staticdev = "${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libgcov.a"
+FILES:libgcov-staticdev = "${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/libgcov.a"
 
-FILES_libgfortran-dev = "\
+FILES:libgfortran-dev = "\
     ${libdir}/libgfortran*.so \
     ${libdir}/libgfortran.spec \
     ${libdir}/libgfortran.la \
@@ -38,11 +38,11 @@ FILES_libgfortran-dev = "\
     ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/finclude/ \
 "
 
-FILES_gcc-sanitizers = "${libdir}/*.spec ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/sanitizer/*.h"
+FILES:gcc-sanitizers = "${libdir}/*.spec ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/sanitizer/*.h"
 
 # This is provided by gcc:
 #    ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include
-FILES_libgcc-dev = "\
+FILES:libgcc-dev = "\
     ${base_libdir}/libgcc*.so \
     ${@oe.utils.conditional('BASETARGET_SYS', '${ORIG_TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
     ${libdir}/${TARGET_SYS}/${BINV}* \
@@ -50,24 +50,24 @@ FILES_libgcc-dev = "\
     ${libdir}/gcc/${TARGET_SYS} \
 "
 
-FILES_libssp-dev = "\
+FILES:libssp-dev = "\
     ${libdir}/libssp*.so \
     ${libdir}/libssp*_nonshared.a \
     ${libdir}/libssp*.la \
     ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/ssp \
 "
 
-FILES_libquadmath-dev = "\
+FILES:libquadmath-dev = "\
     ${libdir}/libquadmath*.so \
     ${libdir}/libquadmath.la \
     ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/quadmath* \
 "
 
-FILES_libgomp-dev = "\
+FILES:libgomp-dev = "\
     ${libdir}/libgomp*${SOLIBSDEV} \
     ${libdir}/libgomp*.la \
     ${libdir}/libgomp.spec \
     ${libdir}/gcc/${ORIG_TARGET_SYS}/${BINV}/include/omp.h \
 "
 
-INSANE_SKIP_libgcc-dev += "staticdev"
+INSANE_SKIP:libgcc-dev += "staticdev"
diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
index f0cefb0d..41dff492 100644
--- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
+++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb
@@ -10,7 +10,7 @@ PR = "r20"
 QT_MKSPECS_LOCATION = "${libdir}"
 QT_MKSPECS_DIR = "linux-oe-g++"
 
-toolchain_create_sdk_env_script_append() {
+toolchain_create_sdk_env_script:append() {
 	echo 'export PATH=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_DIR_NAME}:$PATH' >> $script
 	echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
 	echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
index 0523ada7..b89f54c7 100644
--- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
+++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
@@ -88,7 +88,7 @@ EOF
 
 }
 
-SDK_POSTPROCESS_COMMAND_prepend = "arago_sdk_fixup; "
+SDK_POSTPROCESS_COMMAND:prepend = "arago_sdk_fixup; "
 
 arago_sdk_fixup () {
 	# Remove broken .la files
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
index 1498f70d..4d2a98ad 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 
 inherit packagegroup nativesdk
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     nativesdk-packagegroup-arago-tisdk-host \
     nativesdk-qtbase \
     nativesdk-qttools \
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
index 904f2577..859d9eab 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb
@@ -24,7 +24,7 @@ EXTRA_TI_TOOLS = " \
     ${@oe.utils.all_distro_features(d, "opencl opencv", "${TIDL_TOOLS}")} \
 "
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     nativesdk-packagegroup-sdk-host \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland-dev', '', d)} \
     nativesdk-python3-distutils \
@@ -34,6 +34,6 @@ RDEPENDS_${PN} = "\
     ${EXTRA_TI_TOOLS} \
 "
 
-RDEPENDS_${PN}_remove = "\
+RDEPENDS:${PN}:remove = "\
     nativesdk-meson \
 "
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index f14877e0..e0fb9a1d 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         packagegroup-arago-standalone-sdk-target \
         libsqlite3-dev \
         qtbase-mkspecs \
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
index 936ed17c..9c5a2644 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb
@@ -6,7 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     libgcc \
     libgcc-dev \
     libstdc++-dev \
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
index d531324b..8cbfc7a4 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://interface/prussdrv.c;beginline=1;endline=47;md5=6012fea45c1fbced663277bc90d2163a"
 
-RRECOMMENDS_${PN} = "kernel-module-uio-pru"
+RRECOMMENDS:${PN} = "kernel-module-uio-pru"
 PR = "r0"
-PV_append = "+svn${SRCPV}"
+PV:append = "+svn${SRCPV}"
 
 COMPATIBLE_MACHINE = "omapl138"
 
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
index 6b6d5853..d41f4a66 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
@@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = "file://edma.c;beginline=1;endline=46;md5=f6bde95a8e2277050e3
 
 DEPENDS += "virtual/kernel"
 
-RDEPENDS_${PN} += "ti-pru-sw-edma-driver"
+RDEPENDS:${PN} += "ti-pru-sw-edma-driver"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE = "omapl138"
 
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR:append = "a"
 PR = "${MACHINE_KERNEL_PR}"
-PV_append = "+svn${SRCPV}"
+PV:append = "+svn${SRCPV}"
 
 SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''"
 
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
index e7cb229b..6e602bf0 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=c4fd8ee7443c1b2b6238b4b5df796481"
 DEPENDS = "ti-pru-sw-app-loader ti-pru-sw-edma-library"
-RDEPENDS_${PN} = "ti-pru-sw-edma-driver"
+RDEPENDS:${PN} = "ti-pru-sw-edma-driver"
 PR = "r0"
-PV_append = "+svn${SRCPV}"
+PV:append = "+svn${SRCPV}"
 
 COMPATIBLE_MACHINE = "omapl138"
 
@@ -27,5 +27,5 @@ do_install () {
         install -m 0755 ${S}/example_apps/bin/* ${D}/usr/share/ti/ti-pru-eg/
 }
 
-FILES_${PN} += "${datadir}/ti/ti-pru-eg/*"
-FILES_${PN}-dbg += "${datadir}/ti/ti-pru-eg/.debug/*"
+FILES:${PN} += "${datadir}/ti/ti-pru-eg/*"
+FILES:${PN}-dbg += "${datadir}/ti/ti-pru-eg/.debug/*"
diff --git a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
index c12c0e27..da661a91 100644
--- a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
+++ b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
@@ -15,4 +15,4 @@ EXTRA_OECMAKE += "-DBUILD_TESTING=off"
 
 inherit cmake
 
-FILES_${PN}-dev += "${datadir}/ECM"
+FILES:${PN}-dev += "${datadir}/ECM"
diff --git a/meta-arago-extras/recipes-devtools/dt/dt_17.07.bb b/meta-arago-extras/recipes-devtools/dt/dt_17.07.bb
index 22fd6acf..4ef15f60 100644
--- a/meta-arago-extras/recipes-devtools/dt/dt_17.07.bb
+++ b/meta-arago-extras/recipes-devtools/dt/dt_17.07.bb
@@ -19,7 +19,7 @@ do_compile() {
 	${MAKE} -f Makefile.linux
 }
 
-SRC_URI_append_libc-uclibc = " file://no_aio.patch "
+SRC_URI:append:libc-uclibc = " file://no_aio.patch "
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
index abcbbba5..92363915 100644
--- a/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
+++ b/meta-arago-extras/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb
@@ -5,8 +5,8 @@ LICENSE = "Apache-2.0"
 
 PACKAGE_BEFORE_PN = "${PN}-compiler"
 
-RDEPENDS_${PN}-compiler = "${PN}"
-RDEPENDS_${PN}-dev += "${PN}-compiler"
+RDEPENDS:${PN}-compiler = "${PN}"
+RDEPENDS:${PN}-dev += "${PN}-compiler"
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559"
 
@@ -29,6 +29,6 @@ inherit cmake
 
 S = "${WORKDIR}/git"
 
-FILES_${PN}-compiler = "${bindir}"
+FILES:${PN}-compiler = "${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb b/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
index 6fbc8b60..18efcd53 100644
--- a/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
+++ b/meta-arago-extras/recipes-devtools/input-utils/input-utils_1.0.bb
@@ -8,7 +8,7 @@ PV = "1.0"
 PR = "r0"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/i/input-utils/input-utils_1.0.orig.tar.gz"
-SRC_URI_append_arm = " file://0001-autoconf-fix-for-cross-compilation-for-ARM.patch"
+SRC_URI:append:arm = " file://0001-autoconf-fix-for-cross-compilation-for-ARM.patch"
 
 SRC_URI[md5sum] = "3e58772e8647093b1de2f2c90bfb9ee8"
 SRC_URI[sha256sum] = "ab6f550f01bb5fcede492ab88711d82bacee4229cf2f5dc55a349b3bff4e3b13"
diff --git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20210524.bb b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20210524.bb
index e9431796..f3fcdad3 100644
--- a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20210524.bb
+++ b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20210524.bb
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-extended/ltp/ltp:"
-FILESEXTRAPATHS_prepend := "${ARAGOBASE}/meta-arago-extras/recipes-extended/ltp/ltp:"
+FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-extended/ltp/ltp:"
+FILESEXTRAPATHS:prepend := "${ARAGOBASE}/meta-arago-extras/recipes-extended/ltp/ltp:"
 
 require recipes-extended/ltp/ltp_${PV}.bb
 
@@ -12,24 +12,24 @@ DEPENDS += "alsa-lib"
 
 PE = "1"
 PR = "r5"
-PV_append = "+git${SRCPV}"
+PV:append = "+git${SRCPV}"
 
 SRCREV = "cfff0a2c889f29c03b9a3ee547a147b1c6727e2c"
 BRANCH ?= "master"
 
-SRC_URI_remove = "git://github.com/linux-test-project/ltp.git;protocol=https;branch=master"
-SRC_URI_prepend = "git://git.ti.com/test-automation/ltp-ddt.git;branch=${BRANCH} "
+SRC_URI:remove = "git://github.com/linux-test-project/ltp.git;protocol=https;branch=master"
+SRC_URI:prepend = "git://git.ti.com/test-automation/ltp-ddt.git;branch=${BRANCH} "
 
 export prefix = "/opt/ltp"
 export exec_prefix = "/opt/ltp"
 
-EXTRA_OEMAKE_append = " \
+EXTRA_OEMAKE:append = " \
     KERNEL_USR_INC=${STAGING_INCDIR} \
     ALSA_INCPATH=${STAGING_INCDIR} \
     ALSA_LIBPATH=${STAGING_LIBDIR} \
 "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     acl \
     at \
     pm-qa \
@@ -37,7 +37,7 @@ RDEPENDS_${PN} += "\
     memtester \
 "
 
-do_install_prepend() {
+do_install:prepend() {
 	# Upstream ltp recipe wants to remove this test case in do_install
 	install -d ${D}${prefix}/runtest/
 	echo "memcg_stress" >> ${D}${prefix}/runtest/controllers
diff --git a/meta-arago-extras/recipes-devtools/mtd/mtd-utils_git.bbappend b/meta-arago-extras/recipes-devtools/mtd/mtd-utils_git.bbappend
index aadca84b..aec6a1ac 100644
--- a/meta-arago-extras/recipes-devtools/mtd/mtd-utils_git.bbappend
+++ b/meta-arago-extras/recipes-devtools/mtd/mtd-utils_git.bbappend
@@ -1,14 +1,14 @@
-PR_append = ".arago1"
+PR:append = ".arago1"
 
 BBCLASSEXTEND += "nativesdk"
 
 EXTRA_OEMAKE = "'CC=${CC} ${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'RANLIB=${RANLIB}' 'AR=${AR}' 'BUILDDIR=${S}'"
 
-do_compile_append() {
+do_compile:append() {
 	oe_runmake tests
 }
 
-do_install_append() {
+do_install:append() {
 	install -m 0755 io_update ${D}${sbindir}/
 	install -m 0755 volrefcnt ${D}${sbindir}/
 	install -m 0755 integ ${D}${sbindir}/
@@ -25,7 +25,7 @@ do_install_append() {
 
 PACKAGES =+ "mtd-utils-ubifs-tests"
 
-FILES_mtd-utils-ubifs-tests = " \
+FILES:mtd-utils-ubifs-tests = " \
 ${sbindir}/io_update \
 ${sbindir}/volrefcnt \
 ${sbindir}/integ \
diff --git a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
index 6055507c..df0b1440 100644
--- a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
+++ b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
@@ -13,5 +13,5 @@ do_install() {
                     ${D}${datadir}/bash-completion/completions/opkg
 }
 
-FILES_${PN} = "${datadir}/bash-completion/completions/opkg"
-RDEPENDS_${PN} = "bash-completion"
+FILES:${PN} = "${datadir}/bash-completion/completions/opkg"
+RDEPENDS:${PN} = "bash-completion"
diff --git a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
index 81c8a805..2dfb731d 100644
--- a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
+++ b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
@@ -31,4 +31,4 @@ do_install() {
     cp -rf ${S}/configurations ${D}/${installdir}/
 }
 
-FILES_${PN} += "${installdir}/*"
+FILES:${PN} += "${installdir}/*"
diff --git a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
index 9d770751..c924e8de 100644
--- a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
+++ b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
@@ -21,4 +21,4 @@ do_install() {
     install ${S}/Release_Notes.txt ${D}/${installdir}
 }
 
-FILES_${PN} += "${installdir}/*"
+FILES:${PN} += "${installdir}/*"
diff --git a/meta-arago-extras/recipes-devtools/statcol/statcol.bb b/meta-arago-extras/recipes-devtools/statcol/statcol.bb
index 41c18501..ee2b12d2 100644
--- a/meta-arago-extras/recipes-devtools/statcol/statcol.bb
+++ b/meta-arago-extras/recipes-devtools/statcol/statcol.bb
@@ -9,7 +9,7 @@ SRCREV = "dd0131eadf3633e8f9d06cb390d3c6c1b074d873"
 SRC_URI = "git://git.ti.com/glsdk/statcol.git;protocol=${PROTOCOL};branch=${BRANCH}"
 
 DEPENDS = "ti-rpmsg-char websocketd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 S = "${WORKDIR}/git"
 
@@ -19,6 +19,6 @@ do_install() {
 	DESTDIR=${D} make install
 }
 
-PR_append = "_3"
+PR:append = "_3"
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-devtools/util-scripts/glsdk-util-scripts.bb b/meta-arago-extras/recipes-devtools/util-scripts/glsdk-util-scripts.bb
index 9dd2cd39..49337130 100644
--- a/meta-arago-extras/recipes-devtools/util-scripts/glsdk-util-scripts.bb
+++ b/meta-arago-extras/recipes-devtools/util-scripts/glsdk-util-scripts.bb
@@ -5,7 +5,7 @@ PR = "r1"
 
 COMPATIBLE_MACHINE = "omap-a15|j7"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = "git://git.ti.com/glsdk/util-scripts.git"
 
@@ -28,4 +28,4 @@ do_install() {
 
 }
 
-FILES_${PN} += "${datadir}/ti/util-scripts/*"
+FILES:${PN} += "${datadir}/ti/util-scripts/*"
diff --git a/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb b/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb
index 39e180d5..2ec6a19a 100644
--- a/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb
+++ b/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb
@@ -15,4 +15,4 @@ SRCREV = "035c18cc3e6962dabd5ea2ad8845260726a4a99e"
 export http_proxy
 
 # Development package contains all the examples in different languages
-INSANE_SKIP_${PN}-dev = "file-rdeps"
+INSANE_SKIP:${PN}-dev = "file-rdeps"
diff --git a/meta-arago-extras/recipes-extended/ltp/ltp_20200120.bb b/meta-arago-extras/recipes-extended/ltp/ltp_20200120.bb
index 6633755a..0ecfcc9e 100644
--- a/meta-arago-extras/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta-arago-extras/recipes-extended/ltp/ltp_20200120.bb
@@ -15,18 +15,18 @@ LIC_FILES_CHKSUM = "\
 "
 
 DEPENDS = "attr libaio libcap acl openssl zip-native"
-DEPENDS_append_libc-musl = " fts "
-EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
-EXTRA_OECONF_append_libc-musl = " LIBS=-lfts "
+DEPENDS:append:libc-musl = " fts "
+EXTRA_OEMAKE:append:libc-musl = " LIBC=musl "
+EXTRA_OECONF:append:libc-musl = " LIBS=-lfts "
 
 # since ltp contains x86-64 assembler which uses the frame-pointer register,
 # set -fomit-frame-pointer x86-64 to handle cases where optimisation
 # is set to -O0 or frame pointers have been enabled by -fno-omit-frame-pointer
 # earlier in CFLAGS, etc.
-CFLAGS_append_x86-64 = " -fomit-frame-pointer"
+CFLAGS:append:x86-64 = " -fomit-frame-pointer"
 
-CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
 SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
@@ -80,7 +80,7 @@ do_install(){
     sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers
 }
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     attr \
     bash \
     bc \
@@ -109,14 +109,14 @@ RDEPENDS_${PN} = "\
     tar \
 "
 
-FILES_${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
+FILES:${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
 
 # Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail
 INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01"
-INSANE_SKIP_${PN} += "already-stripped staticdev"
+INSANE_SKIP:${PN} += "already-stripped staticdev"
 
 # Avoid file dependency scans, as LTP checks for things that may or may not
 # exist on the running system.  For instance it has specific checks for
 # csh and ksh which are not typically part of OpenEmbedded systems (but
 # can be added via additional layers.)
-SKIP_FILEDEPS_${PN} = '1'
+SKIP_FILEDEPS:${PN} = '1'
diff --git a/meta-arago-extras/recipes-extended/ltp/ltp_20210524.bb b/meta-arago-extras/recipes-extended/ltp/ltp_20210524.bb
index 4cc97421..2836f1bc 100644
--- a/meta-arago-extras/recipes-extended/ltp/ltp_20210524.bb
+++ b/meta-arago-extras/recipes-extended/ltp/ltp_20210524.bb
@@ -15,18 +15,18 @@ LIC_FILES_CHKSUM = "\
 "
 
 DEPENDS = "attr libaio libcap acl openssl zip-native"
-DEPENDS_append_libc-musl = " fts "
-EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
-EXTRA_OECONF_append_libc-musl = " LIBS=-lfts "
+DEPENDS:append:libc-musl = " fts "
+EXTRA_OEMAKE:append:libc-musl = " LIBC=musl "
+EXTRA_OECONF:append:libc-musl = " LIBS=-lfts "
 
 # since ltp contains x86-64 assembler which uses the frame-pointer register,
 # set -fomit-frame-pointer x86-64 to handle cases where optimisation
 # is set to -O0 or frame pointers have been enabled by -fno-omit-frame-pointer
 # earlier in CFLAGS, etc.
-CFLAGS_append_x86-64 = " -fomit-frame-pointer"
+CFLAGS:append:x86-64 = " -fomit-frame-pointer"
 
-CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
 SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git;protocol=https;branch=master \
@@ -75,7 +75,7 @@ do_install(){
     sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers
 }
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     attr \
     bash \
     bc \
@@ -105,11 +105,11 @@ RDEPENDS_${PN} = "\
     tar \
 "
 
-FILES_${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
+FILES:${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
 
 # Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail
 INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01"
-INSANE_SKIP_${PN} += "already-stripped staticdev"
+INSANE_SKIP:${PN} += "already-stripped staticdev"
 
 remove_broken_musl_sources() {
 	[ "${TCLIBC}" = "musl" ] || return 0
@@ -135,5 +135,5 @@ do_patch[postfuncs] += "remove_broken_musl_sources"
 # exist on the running system.  For instance it has specific checks for
 # csh and ksh which are not typically part of OpenEmbedded systems (but
 # can be added via additional layers.)
-SKIP_FILEDEPS_${PN} = '1'
+SKIP_FILEDEPS:${PN} = '1'
 
diff --git a/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb b/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
index c4ff59fe..0e83979f 100644
--- a/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
+++ b/meta-arago-extras/recipes-graphics/glfw/glfw_git.bb
@@ -21,4 +21,4 @@ inherit cmake pkgconfig
 
 EXTRA_OECMAKE += "-DGLFW_USE_WAYLAND=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF"
 
-FILES_${PN}-dev += "${libdir}/cmake"
+FILES:${PN}-dev += "${libdir}/cmake"
diff --git a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
index 3e2452f4..a11d8192 100644
--- a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
+++ b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
@@ -18,7 +18,7 @@ SRCREV="52466430609c402a9f1c0667ccf727d096336d0d"
 
 PR = "r52"
 
-do_install_append () {
+do_install:append () {
     install -d ${D}${sysconfdir}/glsdkstatcoll
     install -m 0644 ${S}/bandwidth-tool/config.ini ${D}${sysconfdir}/glsdkstatcoll/.
     install -m 0644 ${S}/bandwidth-tool/initiators.cfg ${D}${sysconfdir}/glsdkstatcoll/.
@@ -28,6 +28,6 @@ do_install_append () {
     install -m 0644 ${S}/cpuload-plugins/scripts/*.cfg ${D}${sysconfdir}/visualization_scripts/.
 }
 
-FILES_${PN} += "${sysconfdir}/glsdkstatcoll/* ${sysconfdir}/visualization_scripts/*"
+FILES:${PN} += "${sysconfdir}/glsdkstatcoll/* ${sysconfdir}/visualization_scripts/*"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb b/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
index 6c9953d0..d855d191 100644
--- a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
+++ b/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE = "omap-a15|ti43x|ti33x|k3"
 
 S = "${WORKDIR}/git"
 SRC_DIR = "arm"
-SRC_DIR_k3 = "arm64"
+SRC_DIR:k3 = "arm64"
 
 do_install () {
     CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
@@ -49,7 +49,7 @@ do_install () {
     install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2FilmTV ${D}${bindir}/SGX/demos/DRM/
 }
 
-do_install_append_j7 () {
+do_install:append:j7 () {
     install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/
     install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/
     install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/
@@ -72,12 +72,12 @@ do_install_append_j7 () {
 }
 
 
-RDEPENDS_${PN} = "libegl"
+RDEPENDS:${PN} = "libegl"
 
 INHIBIT_PACKAGE_STRIP = "1"
 
-INSANE_SKIP_${PN} += "dev-so staticdev already-stripped ldflags file-rdeps"
+INSANE_SKIP:${PN} += "dev-so staticdev already-stripped ldflags file-rdeps"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     /opt/img-powervr-sdk/* \
 "
diff --git a/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb b/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
index b10aa5dd..519b8299 100644
--- a/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
+++ b/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
@@ -18,14 +18,14 @@ DEPENDS = "drm fmt"
 
 PACKAGES =+ "${PN}-python"
 
-RDEPENDS_${PN}-python += "python3-core"
+RDEPENDS:${PN}-python += "python3-core"
 
-FILES_${PN}-python += "${libdir}/python*/site-packages"
+FILES:${PN}-python += "${libdir}/python*/site-packages"
 
 S = "${WORKDIR}/git"
 
 inherit python3native meson update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "kmstest"
+ALTERNATIVE:${PN} = "kmstest"
 ALTERNATIVE_LINK_NAME[kmstest] = "${bindir}/kmstest"
diff --git a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
index 9138f27f..e84195ff 100644
--- a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
+++ b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
@@ -32,5 +32,5 @@ do_install() {
 	done
 }
 
-INSANE_SKIP_${PN} += "ldflags already-stripped libdir"
-INSANE_SKIP_${PN}-dbg += "libdir"
+INSANE_SKIP:${PN} += "ldflags already-stripped libdir"
+INSANE_SKIP:${PN}-dbg += "libdir"
diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
index 747a9ef9..1f66158b 100644
--- a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
+++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
@@ -1,7 +1,7 @@
 # This recipe installs an init script that can be used to invoke ts_calibrate
 # on systems that need this done during the boot sequence.
 DESCRIPTION = "TS calibration init script"
-RDEPENDS_${PN} += "tslib"
+RDEPENDS:${PN} += "tslib"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60"
diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend b/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend
index c7803c38..332e9c97 100644
--- a/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR_append = ".arago2"
+PR:append = ".arago2"
 
 SRC_URI += " \
     file://0001-wayland-drm-Add-wayland-drm-protocol-to-stable.patch \
     file://0002-wayland-drm-Update-to-version-2.patch \
 "
 
-do_install_append() {
+do_install:append() {
 	install -d ${D}${datadir}/wayland-protocols/stable/wayland-drm
 	cp ${S}/stable/wayland-drm/wayland-drm.xml ${D}${datadir}/wayland-protocols/stable/wayland-drm/
 }
diff --git a/meta-arago-extras/recipes-kernel/timestamping/timestamping_4.1.bb b/meta-arago-extras/recipes-kernel/timestamping/timestamping_4.1.bb
index f801cf08..c9151c03 100644
--- a/meta-arago-extras/recipes-kernel/timestamping/timestamping_4.1.bb
+++ b/meta-arago-extras/recipes-kernel/timestamping/timestamping_4.1.bb
@@ -21,4 +21,4 @@ do_install () {
 	install -m 0755 ${S}/Documentation/networking/timestamping/timestamping ${D}${bindir}
 }
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb b/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
index c1caa980..2d9f41b0 100644
--- a/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
+++ b/meta-arago-extras/recipes-multimedia/amsdk-av-files/amsdk-av-files_1.4.bb
@@ -9,14 +9,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 VIDEO_FILES = "video_480p "
 
-VIDEO_FILES_append_ti33x       = "video_wvga \
+VIDEO_FILES:append:ti33x       = "video_wvga \
                                   video_wqvga"
-VIDEO_FILES_append_ti43x       = "video_wqvga"
-VIDEO_FILES_append_dra7xx      = "video_wvga \
+VIDEO_FILES:append:ti43x       = "video_wqvga"
+VIDEO_FILES:append:dra7xx      = "video_wvga \
                                   video_1080p \
                                   video_720p \
                                   video_yuv"
-VIDEO_FILES_append_k3          = "video_720p"
+VIDEO_FILES:append:k3          = "video_720p"
 
 BRANCH = "master"
 
@@ -39,4 +39,4 @@ do_install() {
     done
 }
 
-FILES_${PN} += "${datadir}/ti/*"
+FILES:${PN} += "${datadir}/ti/*"
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
index eaa52a7b..f2fff127 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
@@ -37,11 +37,11 @@ do_install() {
 
 PACKAGES += "matrix-gui-apps-dual-camera"
 
-RDEPENDS_${PN} += "libdrm libdrm-omap"
+RDEPENDS:${PN} += "libdrm libdrm-omap"
 
-RDEPENDS_matrix-gui-apps-dual-camera  = "matrix-gui-apps-images matrix-gui-submenus-camera ${PN}"
+RDEPENDS:matrix-gui-apps-dual-camera  = "matrix-gui-apps-images matrix-gui-submenus-camera ${PN}"
 
 # Add the matrix directory to the FILES
-FILES_${PN} = "/usr/bin/*"
+FILES:${PN} = "/usr/bin/*"
 
-FILES_matrix-gui-apps-dual-camera = "${MATRIX_APP_DIR}/*"
+FILES:matrix-gui-apps-dual-camera = "${MATRIX_APP_DIR}/*"
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
index 4f7f73e5..c9505652 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "opencl"
 
 PR = "r1"
 
-RDEPENDS_${PN} += "opencl-runtime"
+RDEPENDS:${PN} += "opencl-runtime"
 
 EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \
                  TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \
@@ -38,13 +38,13 @@ do_configure() {
 EXTRA_OECONF += "--enable-maintainer-mode"
 EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'"
 
-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
 
-FILES_${PN} += "${libdir}/*.so"
-FILES_${PN}-dbg += "${libdir}/.debug"
-FILES_${PN}-dev += "${libdir}/*.la"
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dbg += "${libdir}/.debug"
+FILES:${PN}-dev += "${libdir}/*.la"
 FILES_SOLIBSDEV = ""
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb
index ccf0fd55..e45de0dd 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb
@@ -18,4 +18,4 @@ SRC_URI = " \
     file://0001-gstducati-configure.ac-stop-using-export-symbols-reg.patch \
 "
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
index 78dd4d3c..33537f6e 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb
@@ -27,8 +27,8 @@ EXTRA_OECONF += "--enable-maintainer-mode"
 EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'"
 CFLAGS += "-fcommon"
 
-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
 
-INSANE_SKIP_${PN} = "textrel"
+INSANE_SKIP:${PN} = "textrel"
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ti.inc b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ti.inc
index 2a1fa06b..d29fb87e 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ti.inc
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ti.inc
@@ -20,6 +20,6 @@ do_configure() {
 EXTRA_OECONF += "--enable-maintainer-mode"
 EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'"
 
-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
index 64929729..5975b92e 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG_append = " faad kms"
+PACKAGECONFIG:append = " faad kms"
 
 GSTDRM_WAYLANDSINK_PATCHES = " \
     file://0001-gstdrmallocator-Add-DRM-allocator-support.patch \
@@ -12,30 +12,30 @@ GSTDRM_WAYLANDSINK_PATCHES = " \
     file://0001-gstdrm-Remove-wayland-as-required-dependency.patch \
 "
 
-SRC_URI_append_ti43x = " \
+SRC_URI:append:ti43x = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI_append_ti33x = " \
+SRC_URI:append:ti33x = " \
     file://0001-waylandsink-Add-mouse-drag-and-drop-support.patch \
 "
 
-SRC_URI_append_omap-a15 = " \
+SRC_URI:append:omap-a15 = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI_append_am65xx = " \
+SRC_URI:append:am65xx = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI_append_j7-evm = " \
+SRC_URI:append:j7-evm = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI_append_j7-hs-evm = " \
+SRC_URI:append:j7-hs-evm = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR_append = ".arago4"
+PR:append = ".arago4"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
index 4864f4b8..fdb5b63f 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"
 
 SRC_URI += " \
     file://0001-v4l2src-Increase-minimum-num-buffers-by-3.patch \
@@ -9,4 +9,4 @@ SRC_URI += " \
     file://0001-v4l2src-Check-for-drm-memory-support-in-try_import.patch \
 "
 
-PR_append = ".arago3"
+PR:append = ".arago3"
diff --git a/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb b/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
index 9a262311..997ed451 100644
--- a/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
+++ b/meta-arago-extras/recipes-multimedia/hevc-arm-decoder/hevc-arm-decoder_git.bb
@@ -46,8 +46,8 @@ do_install() {
     done
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/*  \
 "
 
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP:${PN} += "ldflags"
diff --git a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
index 59372b05..12ac1b51 100644
--- a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
+++ b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb
@@ -30,5 +30,5 @@ do_install() {
     cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/examples/webengine/webbrowser/.
 }
 
-FILES_${PN} +=  "${bindir}/qtwebbrowser"
-FILES_${PN}-examples +=  "${datadir}/examples/webengine/webbrowser/*"
+FILES:${PN} +=  "${bindir}/qtwebbrowser"
+FILES:${PN}-examples +=  "${datadir}/examples/webengine/webbrowser/*"
diff --git a/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb b/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb
index 07e91e00..3612f7b9 100644
--- a/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb
+++ b/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb
@@ -18,7 +18,7 @@ SRCREV = "35c3eb011d8e2813d83c6a6cbe28a446534e4a14"
 
 S = "${WORKDIR}/git"
 
-do_compile_prepend() {
+do_compile:prepend() {
     sed -i 's/arm-linux-gnueabihf-/${TOOLCHAIN_SYS}-/' SConstruct
     sed -i 's/aarch64-linux-gnu-/${TOOLCHAIN_SYS}-/' SConstruct
     sed -i "s#env.Append(LINKFLAGS = \['-fopenmp'\])#env.Append(LINKFLAGS = \['-fopenmp','--sysroot=${STAGING_DIR_TARGET}'\])#" SConstruct
@@ -28,7 +28,7 @@ do_compile_prepend() {
 inherit scons
 
 EXTRA_OESCONS = "arch=armv7a extra_cxx_flags="-fPIC -Wno-unused-but-set-variable -Wno-ignored-qualifiers -Wno-noexcept ${TOOLCHAIN_OPTIONS}" benchmark_tests=1 validation_tests=0 neon=1 openmp=1 opencl=0 set_soname=1"
-EXTRA_OESCONS_aarch64 = "arch=arm64-v8a extra_cxx_flags="-fPIC -Wno-unused-but-set-variable -Wno-ignored-qualifiers -Wno-noexcept ${TOOLCHAIN_OPTIONS}" benchmark_tests=1 validation_tests=0 neon=1 openmp=1 opencl=0 set_soname=1"
+EXTRA_OESCONS:aarch64 = "arch=arm64-v8a extra_cxx_flags="-fPIC -Wno-unused-but-set-variable -Wno-ignored-qualifiers -Wno-noexcept ${TOOLCHAIN_OPTIONS}" benchmark_tests=1 validation_tests=0 neon=1 openmp=1 opencl=0 set_soname=1"
 
 LIBS += "-larmpl_lp64_mp"
 
@@ -53,9 +53,9 @@ do_install() {
     cp $CP_ARGS ${S}/support ${D}${datadir}/${BPN}/.
 }
 
-INSANE_SKIP_${PN} = "ldflags"
-INSANE_SKIP_${PN}-dev = "dev-elf ldflags"
+INSANE_SKIP:${PN} = "ldflags"
+INSANE_SKIP:${PN}-dev = "dev-elf ldflags"
 
-FILES_${PN}-source = "${datadir}/${BPN}"
-INSANE_SKIP_${PN}-source = "ldflags libdir staticdev"
+FILES:${PN}-source = "${datadir}/${BPN}"
+INSANE_SKIP:${PN}-source = "ldflags libdir staticdev"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-arago-extras/recipes-support/cclink/ccief-basic_git.bb b/meta-arago-extras/recipes-support/cclink/ccief-basic_git.bb
index 21d59b0e..083eaf39 100644
--- a/meta-arago-extras/recipes-support/cclink/ccief-basic_git.bb
+++ b/meta-arago-extras/recipes-support/cclink/ccief-basic_git.bb
@@ -41,4 +41,4 @@ do_install() {
     install -m 644 ${S}/CCIEF-BASIC_Slave/sample/SlaveParameter.csv ${D}${datadir}/cclink
 }
 
-FILES_${PN} += "${datadir}/cclink"
+FILES:${PN} += "${datadir}/cclink"
diff --git a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend b/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
index 281b76a1..f282b247 100644
--- a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
+++ b/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
 file://0001-devmem2-support-different-page-sizes-at-run-time.patch \
diff --git a/meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb b/meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb
index 02d49314..f4a3c248 100644
--- a/meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb
+++ b/meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb
@@ -13,12 +13,12 @@ SRCREV = "e4f0ba5a48649a3253f8b353c87c965e12aafc50"
 S = "${WORKDIR}/git"
 
 DEPENDS = "python3"
-RDEPENDS_${PN} = "python3-core"
+RDEPENDS:${PN} = "python3-core"
 
 inherit autotools
 
 EXTRA_OECONF = "--sbindir=/sbin"
 
-do_configure_prepend() {
+do_configure:prepend() {
 	 sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/utils/ifquery
 }
diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb
index c45acf4f..c1e47def 100644
--- a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb
+++ b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d8927f3331d2b3e321b7dd1925166d25"
 inherit features_check
 
 REQUIRED_DISTRO_FEATURES = "opencv"
-REQUIRED_DISTRO_FEATURES_append_dra7xx = " opencl"
+REQUIRED_DISTRO_FEATURES:append:dra7xx = " opencl"
 
 DEPENDS = "tensorflow-lite flatbuffers opencv"
-DEPENDS_append_dra7xx = " tidl-api"
+DEPENDS:append:dra7xx = " tidl-api"
 
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -46,7 +46,7 @@ EXTRA_OEMAKE += "SYSROOT_INCDIR="${STAGING_INCDIR}" SYSROOT_LIBDIR="${STAGING_LI
                  TIDL_API_DIR="${STAGING_DATADIR}/ti/tidl""
 
 TIDL = "no"
-TIDL_dra7xx = "yes"
+TIDL:dra7xx = "yes"
 do_compile() {
     oe_runmake -f Makefile TIDL_ACC=${TIDL}
 }
@@ -61,4 +61,4 @@ do_install() {
     install -m 0755 ${S}/scripts/run*.sh ${D}${datadir}/tensorflow-lite/demos
 }
 
-FILES_${PN} = "${datadir}/tensorflow-lite/demos"
+FILES:${PN} = "${datadir}/tensorflow-lite/demos"
diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb
index e9739d83..defb6447 100644
--- a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb
+++ b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb
@@ -32,15 +32,15 @@ PR = "r5"
 S = "${WORKDIR}/git"
 
 DEPENDS = "zlib"
-TARGET_CFLAGS_remove = "-O2"
-TARGET_CPPFLAGS_remove = "-O2"
-TARGET_CXXFLAGS_remove = "-O2"
-CFLAGS_append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
+TARGET_CFLAGS:remove = "-O2"
+TARGET_CPPFLAGS:remove = "-O2"
+TARGET_CXXFLAGS:remove = "-O2"
+CFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
     -I${STAGING_INCDIR}"
-CPPFLAGS_append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
+CPPFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
     -I${STAGING_INCDIR}"
-LDFLAGS_remove = "-Wl,-O1"
-CXXFLAGS_append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
+LDFLAGS:remove = "-Wl,-O1"
+CXXFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
     -I${STAGING_INCDIR}"
 LIBS = "-lstdc++ -lpthread -lm -lz -ldl -lrt"
 BUILD_DEPS_DOWNLOAD_DIR_PREFIX = "${S}/tensorflow/lite/tools/make/downloads/"
diff --git a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb b/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
index e0d758d3..3f7ea874 100644
--- a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
+++ b/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb
@@ -17,7 +17,7 @@ DEPENDS = "common-csl-ip-rtos libarch ti-xdctools-native doxygen-native ti-cgt6x
 
 COMPATIBLE_MACHINE = "dra7xx"
 
-TARGET_dra7xx = "SOC_AM572x"
+TARGET:dra7xx = "SOC_AM572x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
@@ -96,8 +96,8 @@ do_install() {
 
 }
 
-FILES_${PN}-dev += "${FFTLIB_INSTALL_DIR_RECIPE}"
+FILES:${PN}-dev += "${FFTLIB_INSTALL_DIR_RECIPE}"
 
 # skip checking binary against ARM architecture
-INSANE_SKIP_${PN}-dev = "arch"
-ALLOW_EMPTY_${PN} = "1"
+INSANE_SKIP:${PN}-dev = "arch"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb b/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb
index 130504b4..9e3347cb 100644
--- a/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb
@@ -10,7 +10,7 @@ PR = "${INC_PR}.0"
 
 DEPENDS = "ti-fftw"
 
-RDEPENDS_${PN} += "ti-fftw-staticdev"
+RDEPENDS:${PN} += "ti-fftw-staticdev"
 
 S = "${WORKDIR}/git/ti/fftw/examples"
 
@@ -21,5 +21,5 @@ do_install() {
     cp -r ./* ${D}${datadir}/ti/examples/fftw
 }
 
-FILES_${PN} = "${datadir}/ti/examples/fftw"
-INSANE_SKIP_${PN} = "ldflags"
+FILES:${PN} = "${datadir}/ti/examples/fftw"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb b/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
index 5cb4e5df..70d5e0c3 100644
--- a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
+++ b/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb
@@ -16,10 +16,10 @@ PR = "${INC_PR}.0"
 
 DEPENDS = "common-csl-ip-rtos common-csl-ip ti-xdctools-native ti-sysbios ti-cgt6x-native ti-xdais libulm fftlib dsplib-c66x opencl clocl-native libarch"
 
-RDEPENDS_${PN} += "opencl-runtime"
+RDEPENDS:${PN} += "opencl-runtime"
 
 COMPATIBLE_MACHINE = "dra7xx"
-TARGET_dra7xx = "SOC_AM572x"
+TARGET:dra7xx = "SOC_AM572x"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/ti/fftw"
@@ -58,6 +58,6 @@ do_install() {
     rm -rf ${D}${datadir}/ti
 }
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
diff --git a/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb b/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb
index 8ea5b656..f7b893f7 100644
--- a/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb
@@ -5,7 +5,7 @@ include libarch.inc
 PR = "${INC_PR}.0"
 
 DEPENDS += "libarch clocl-native"
-RDEPENDS_${PN} += "opencl-runtime"
+RDEPENDS:${PN} += "opencl-runtime"
 
 export LIBARCH_DIR    = "${LIBARCH_INSTALL_DIR}"
 export TARGET_ROOTDIR = "${STAGING_DIR_TARGET}"
@@ -27,10 +27,10 @@ do_install() {
     cp examples/Makefile ${D}${datadir}/ti/examples/libarch
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/examples/libarch/* \ "
 
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
     ${datadir}/ti/examples/libarch/*/.debug \ "
 
-INSANE_SKIP_${PN} = "arch ldflags textrel"
+INSANE_SKIP:${PN} = "arch ldflags textrel"
diff --git a/meta-arago-extras/recipes-ti/libarch/libarch.inc b/meta-arago-extras/recipes-ti/libarch/libarch.inc
index ee3bc747..1985a6b4 100644
--- a/meta-arago-extras/recipes-ti/libarch/libarch.inc
+++ b/meta-arago-extras/recipes-ti/libarch/libarch.inc
@@ -33,4 +33,4 @@ export XDAIS_DIR = "${XDAIS_INSTALL_DIR}"
 export FC_DIR = "${FC_INSTALL_DIR}"
 export PDK_DIR = "${PDK_INSTALL_DIR}"
 
-TARGET_dra7xx = "SOC_AM572x"
+TARGET:dra7xx = "SOC_AM572x"
diff --git a/meta-arago-extras/recipes-ti/libarch/libarch_git.bb b/meta-arago-extras/recipes-ti/libarch/libarch_git.bb
index f125c4ac..4151e1c4 100644
--- a/meta-arago-extras/recipes-ti/libarch/libarch_git.bb
+++ b/meta-arago-extras/recipes-ti/libarch/libarch_git.bb
@@ -13,8 +13,8 @@ do_install() {
     cp -r exports/libarch_*/* ${D}${LIBARCH_INSTALL_DIR_RECIPE}
 }
 
-FILES_${PN}-dev += "${LIBARCH_INSTALL_DIR_RECIPE}"
+FILES:${PN}-dev += "${LIBARCH_INSTALL_DIR_RECIPE}"
 
 # skip checking binary against ARM architecture
-INSANE_SKIP_${PN}-dev = "arch"
-ALLOW_EMPTY_${PN} = "1"
+INSANE_SKIP:${PN}-dev = "arch"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
index 350c5cf8..0871193f 100644
--- a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb
@@ -4,7 +4,7 @@ include linalg.inc
 PR = "${INC_PR}.0"
 
 DEPENDS += "linalg"
-RDEPENDS_${PN} += "opencl-runtime"
+RDEPENDS:${PN} += "opencl-runtime"
 
 export LINALG_DIR = "${LINALG_INSTALL_DIR}"
 
@@ -23,12 +23,12 @@ do_install() {
     cp -r examples/arm+dsp/* ${D}${datadir}/ti/examples/linalg
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/examples/linalg/* \
 "
 
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
     ${datadir}/ti/examples/linalg/*/.debug \
 "
 
-INSANE_SKIP_${PN} = "arch ldflags textrel"
+INSANE_SKIP:${PN} = "arch ldflags textrel"
diff --git a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
index 3b9220a9..aa87f5f2 100644
--- a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
+++ b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "TI Linear Algebra Library"
 include linalg.inc
 PR = "${INC_PR}.0"
 
-TARGET_dra7xx        = "SOC_AM572x"
-MEM_MODEL_dra7xx     = "Small"
+TARGET:dra7xx        = "SOC_AM572x"
+MEM_MODEL:dra7xx     = "Small"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_compile() {
@@ -17,9 +17,9 @@ do_install() {
 }
 
 # to create a package for LINALG
-FILES_${PN}-dev += "${LINALG_INSTALL_DIR_RECIPE}"
+FILES:${PN}-dev += "${LINALG_INSTALL_DIR_RECIPE}"
 
-INSANE_SKIP_${PN}-dev = "arch staticdev"
-ALLOW_EMPTY_${PN} = "1"
+INSANE_SKIP:${PN}-dev = "arch staticdev"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN}-dev += "bash perl"
+RDEPENDS:${PN}-dev += "bash perl"
diff --git a/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb b/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
index 5bf1e565..2054b1bb 100644
--- a/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/llvm-rtos/llvm-rtos_git.bb
@@ -19,7 +19,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
 RELEASE_TARGET = ""
-RELEASE_TARGET_omap-a15 = "am57xx"
+RELEASE_TARGET:omap-a15 = "am57xx"
 
 CLEANBROKEN = "1"
 
@@ -55,10 +55,10 @@ do_install() {
     done
 }
 
-FILES_${PN} += "${LLVM_RTOS_INSTALL_DIR_RECIPE}"
+FILES:${PN} += "${LLVM_RTOS_INSTALL_DIR_RECIPE}"
 
 # This package contains one x86-64 executable and a few static libraries
-INSANE_SKIP_${PN} = "arch file-rdeps staticdev"
+INSANE_SKIP:${PN} = "arch file-rdeps staticdev"
 
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
index fad8d77b..086497ec 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
@@ -13,8 +13,8 @@ DEPENDS = "ti-llvm3.6-native boost-native"
 
 S = "${WORKDIR}/git/host"
 
-TARGET_class-target = "am57xx"
-TARGET_class-native = "x86"
+TARGET:class-target = "am57xx"
+TARGET:class-native = "x86"
 
 export WANT_LLVM_RELEASE = "3.6-ti"
 export DESTDIR="${D}${OCL_RTOS_INSTALL_DIR_RECIPE}"
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
index 230c34aa..18d304b7 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
@@ -21,7 +21,7 @@ COMPATIBLE_MACHINE = "omap-a15"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RELEASE_TARGET = ""
-RELEASE_TARGET_omap-a15 = "am57xx"
+RELEASE_TARGET:omap-a15 = "am57xx"
 
 S = "${WORKDIR}/git"
 export DESTDIR="${OCL_RTOS_INSTALL_DIR}/ti-opencl-rtos-${RELEASE_TARGET}-${PV}/packages/ti/opencl"
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
index 71685ba2..2aa130ba 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
@@ -37,13 +37,13 @@ OCL_EXAMPLE_LIST = " abort_exit \
 "
 
 RELEASE_TARGET = ""
-RELEASE_TARGET_omap-a15 = "am57xx"
+RELEASE_TARGET:omap-a15 = "am57xx"
 
 export BIOS_INSTALL_DIR = "${SYSBIOS_INSTALL_DIR}"
 export DESTDIR="${OCL_RTOS_INSTALL_DIR}/ti-opencl-rtos-${RELEASE_TARGET}-${PV}"
 export TI_OCL_INSTALL = "${DESTDIR}/packages/ti/opencl"
 
-python do_unpack_append() {
+python do_unpack:append() {
     import shutil
 
     git_dir = d.expand("${WORKDIR}/git/examples")
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
index 6b96eb4c..81ab0fa4 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
@@ -26,10 +26,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/monitor"
 
-BUILD_TARGET_omap-a15   = "ARM_AM57"
+BUILD_TARGET:omap-a15   = "ARM_AM57"
 
 RELEASE_TARGET = ""
-RELEASE_TARGET_omap-a15 = "am57xx"
+RELEASE_TARGET:omap-a15 = "am57xx"
 
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 export PDK_DIR = "${PDK_INSTALL_DIR}"
@@ -72,5 +72,5 @@ do_install() {
     install -m ${OCL_FPERMS} cmds/monitor.am57x_rtos.cmd ${SHARE_PATH}
 }
 
-FILES_${PN} += "${OCL_RTOS_INSTALL_DIR_RECIPE}"
-INSANE_SKIP_${PN} = "arch"
+FILES:${PN} += "${OCL_RTOS_INSTALL_DIR_RECIPE}"
+INSANE_SKIP:${PN} = "arch"
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
index 5e179ec1..aa30b52a 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
@@ -25,9 +25,9 @@ DEPENDS = "cmake-native \
            ti-cgt6x-native \
 "
 
-#RDEPENDS_${PN}-dev += " opencl-monitor-rtos"
+#RDEPENDS:${PN}-dev += " opencl-monitor-rtos"
 
-ALLOW_EMPTY_${PN}-runtime = "1"
+ALLOW_EMPTY:${PN}-runtime = "1"
 
 
 S = "${WORKDIR}/git/host"
@@ -35,13 +35,13 @@ B = "${WORKDIR}/build"
 
 export WANT_LLVM_RELEASE = "3.6-ti"
 
-OCL_BUILD_TARGET_omap-a15   = "ARM_AM57"
+OCL_BUILD_TARGET:omap-a15   = "ARM_AM57"
 
 ENABLE_ULM = "0"
 SHMEM_MANAGER = "CMEM"
 
 RELEASE_TARGET = ""
-RELEASE_TARGET_omap-a15 = "am57xx"
+RELEASE_TARGET:omap-a15 = "am57xx"
 
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 export ARM_LLVM_DIR="${LLVM_RTOS_INSTALL_DIR}"
@@ -94,7 +94,7 @@ do_install() {
     install -m 755 ${STAGING_DIR_NATIVE}/usr/share/ti/ti-opencl-rtos-tree/bin/x86/clocl ${D}/usr/share/ti/opencl/bin/x86
 }
 
-FILES_${PN}-dev += "/usr/share/ti/opencl ${OCL_RTOS_INSTALL_DIR_RECIPE}"
+FILES:${PN}-dev += "/usr/share/ti/opencl ${OCL_RTOS_INSTALL_DIR_RECIPE}"
 
-INSANE_SKIP_${PN} = "already-stripped"
-INSANE_SKIP_${PN}-dev = "staticdev file-rdeps arch"
+INSANE_SKIP:${PN} = "already-stripped"
+INSANE_SKIP:${PN}-dev = "staticdev file-rdeps arch"
diff --git a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
index df77d7ed..5638ef4d 100644
--- a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
@@ -12,9 +12,9 @@ S = "${WORKDIR}/git/host"
 
 export WANT_LLVM_RELEASE = "3.6-ti"
 
-TARGET_class-target = "arm"
-TARGET_class-native = "x86"
-TARGET_class-nativesdk = "x86"
+TARGET:class-target = "arm"
+TARGET:class-native = "x86"
+TARGET:class-nativesdk = "x86"
 
 EXTRA_OEMAKE = " -C ${S}/clocl \
                  _PRODUCT_VERSION=${PV} \
@@ -31,5 +31,5 @@ do_install() {
   install -m 755 ${S}/clocl/${TARGET}/clocl ${D}${bindir}
 }
 
-RDEPENDS_${PN} += "ti-cgt6x"
+RDEPENDS:${PN} += "ti-cgt6x"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-ti/ocl/ocl-gl-headers_git.bb b/meta-arago-extras/recipes-ti/ocl/ocl-gl-headers_git.bb
index bff4e634..c8934154 100644
--- a/meta-arago-extras/recipes-ti/ocl/ocl-gl-headers_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/ocl-gl-headers_git.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://../GL/gl.h;startline=1;endline=24;md5=10424a07c8d8310e34ced799b95f0fb6"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 SRC_URI = " \
     file://GL/gl.h \
diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index c1b475a3..b03d2040 100644
--- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
+++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
@@ -4,7 +4,7 @@ INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/ocl:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/ocl:"
 
 OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
 OCL_GIT_PROTOCOL = "git"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index 8e77302e..7e5aaeb8 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -14,17 +14,17 @@ DEPENDS = "opencl opencl-monitor ti-cgt6x-native clocl-native"
 
 OCL_PERSISTENT_DEPENDS = "ti-xdctools-native ti-ipc-rtos ti-sysbios"
 
-DEPENDS_append_dra7xx = " ${OCL_PERSISTENT_DEPENDS}"
+DEPENDS:append:dra7xx = " ${OCL_PERSISTENT_DEPENDS}"
 
 # Split examples into two groups:
 # - offline-compile: examples who's kernels are precompiled (offline).
 # - runtime-compile: examples who's kernels are compiled during runtime.
 PACKAGES =+ "${PN}-runtime-compile ${PN}-runtime-compile-dbg ${PN}-offline-compile ${PN}-offline-compile-dbg"
 
-RDEPENDS_${PN} = "${PN}-runtime-compile ${PN}-offline-compile"
-RDEPENDS_${PN}-dev += "libgomp-dev"
-RDEPENDS_${PN}-offline-compile += "opencl-runtime"
-RDEPENDS_${PN}-runtime-compile += "opencl"
+RDEPENDS:${PN} = "${PN}-runtime-compile ${PN}-offline-compile"
+RDEPENDS:${PN}-dev += "libgomp-dev"
+RDEPENDS:${PN}-offline-compile += "opencl-runtime"
+RDEPENDS:${PN}-runtime-compile += "opencl"
 
 S = "${WORKDIR}/git/opencl_example_src"
 B = "${S}"
@@ -74,18 +74,18 @@ OCL_PERSISTENT_EXAMPLE_LIST = " persistent_clock_concurrent \
                                 persistent_task_spanning \
 "
 
-OCL_EXAMPLE_LIST_append_dra7xx = " ${OCL_PERSISTENT_EXAMPLE_LIST}"
+OCL_EXAMPLE_LIST:append:dra7xx = " ${OCL_PERSISTENT_EXAMPLE_LIST}"
 
 OCL_MPAX_EXAMPLE_LIST = " vecadd_mpax \
                           vecadd_mpax_openmp \
 "
 
-python do_unpack_append() {
+python do_unpack:append() {
     s = d.getVar("S")
     os.makedirs(s)
 }
 
-python do_patch_append() {
+python do_patch:append() {
     import shutil
     git_dir = d.expand("${WORKDIR}/git/examples")
     s = d.getVar("S")
@@ -117,28 +117,28 @@ do_install() {
 }
 
 # First package the examples which require run-time kernel compilation.
-FILES_${PN}-runtime-compile += "\
+FILES:${PN}-runtime-compile += "\
     ${@' '.join(['${datadir}/ti/examples/opencl/' + example for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \
 "
 
-FILES_${PN}-runtime-compile-dbg += "\
+FILES:${PN}-runtime-compile-dbg += "\
     ${@' '.join(['${datadir}/ti/examples/opencl/' + example + '/.debug' for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \
 "
 
 # Remaining examples will fall through to the "offline" package.
-FILES_${PN}-offline-compile += "\
+FILES:${PN}-offline-compile += "\
     ${datadir}/ti/examples/opencl/ \
 "
 
-FILES_${PN}-offline-compile-dbg += "\
+FILES:${PN}-offline-compile-dbg += "\
     ${datadir}/ti/examples/opencl/*/.debug \
 "
 
 # Add makefiles to dev package
-FILES_${PN}-dev = "${datadir}/ti/examples/opencl/Makefile \
+FILES:${PN}-dev = "${datadir}/ti/examples/opencl/Makefile \
                    ${datadir}/ti/examples/opencl/make.inc"
 
-ALLOW_EMPTY_${PN} = "1"
-INSANE_SKIP_${PN} = "arch ldflags textrel staticdev"
-INSANE_SKIP_${PN}-offline-compile = "arch ldflags textrel staticdev"
-INSANE_SKIP_${PN}-runtime-compile = "arch ldflags textrel staticdev"
+ALLOW_EMPTY:${PN} = "1"
+INSANE_SKIP:${PN} = "arch ldflags textrel staticdev"
+INSANE_SKIP:${PN}-offline-compile = "arch ldflags textrel staticdev"
+INSANE_SKIP:${PN}-runtime-compile = "arch ldflags textrel staticdev"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
index 0e7e4540..44000977 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
@@ -50,15 +50,15 @@ do_install() {
     install -m ${OCL_FPERMS} bin/release/server_ipu1.xem4 ${D}${base_libdir}/firmware/dra7-ipu1-fw.xem4.opencl-monitor
 }
 
-ALTERNATIVE_${PN} = "dra7-ipu1-fw.xem4"
+ALTERNATIVE:${PN} = "dra7-ipu1-fw.xem4"
 ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4"
 ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4.opencl-monitor"
 ALTERNATIVE_PRIORITY = "100"
 
 MONITOR_IPU_FIRMWARE = "${base_libdir}/firmware/dra7-ipu1-fw.*"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${MONITOR_IPU_FIRMWARE} \
 "
 
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index 4beadb36..930d270b 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -30,7 +30,7 @@ DEPENDS = " ti-llvm3.6-native \
             openmp-rtos \
 "
 
-DEPENDS_append_dra7xx = " opencl-tidl-fw \
+DEPENDS:append:dra7xx = " opencl-tidl-fw \
 "
 
 COMPATIBLE_MACHINE = "dra7xx"
@@ -38,7 +38,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/monitor"
 
-BUILD_TARGET_dra7xx = "ARM_AM57"
+BUILD_TARGET:dra7xx = "ARM_AM57"
 
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
 export PDK_DIR = "${PDK_INSTALL_DIR}"
@@ -78,14 +78,14 @@ install_dsp_objs() {
     install -m ${OCL_FPERMS} monitor_${1}/dsp0.syms ${SHARE_PATH}/dsp.syms
 }
 
-do_install_append_dra7xx() {
+do_install:append:dra7xx() {
     install_dsp_objs am57x
     install -m ${OCL_DPERMS} -d ${D}${base_libdir}/firmware
     install -m ${OCL_FPERMS} monitor_am57x/dsp0.out ${D}${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}
     install -m ${OCL_FPERMS} monitor_am57x/dsp1.out ${D}${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}
 }
 
-ALTERNATIVE_${PN}_dra7xx = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66"
+ALTERNATIVE:${PN}:dra7xx = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66"
 ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66"
 ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}"
 ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66"
@@ -93,11 +93,11 @@ ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe
 ALTERNATIVE_PRIORITY = "100"
 
 MONITOR_FIRMWARE = ""
-MONITOR_FIRMWARE_dra7xx = "${base_libdir}/firmware/*"
+MONITOR_FIRMWARE:dra7xx = "${base_libdir}/firmware/*"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/ti/opencl/* \
     ${MONITOR_FIRMWARE} \
 "
 
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb
index 0e8b46d6..67d1769a 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb
@@ -30,9 +30,9 @@ do_install() {
     done
 }
 
-FILES_${PN} += "${OCL_TIDL_FW_INSTALL_DIR_RECIPE}"
+FILES:${PN} += "${OCL_TIDL_FW_INSTALL_DIR_RECIPE}"
 
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
 
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index d6399432..4ee67332 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -17,7 +17,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES =+ "${PN}-runtime"
 
 MONITORS                      = " opencl-monitor"
-MONITORS_append_dra7xx        = " opencl-monitor-ipu"
+MONITORS:append:dra7xx        = " opencl-monitor-ipu"
 
 DEPENDS = " ocl-gl-headers \
             ${MONITORS} \
@@ -37,20 +37,20 @@ DEPENDS = " ocl-gl-headers \
             json-c \
 "
 
-DEPENDS_append_dra7xx = " ti-ipc virtual/kernel"
+DEPENDS:append:dra7xx = " ti-ipc virtual/kernel"
 
-RDEPENDS_${PN}-runtime += "bash ${MONITORS}"
-RDEPENDS_${PN}-dev += "ocl-gl-headers-dev"
-RDEPENDS_${PN} += "${PN}-runtime clocl bash"
+RDEPENDS:${PN}-runtime += "bash ${MONITORS}"
+RDEPENDS:${PN}-dev += "ocl-gl-headers-dev"
+RDEPENDS:${PN} += "${PN}-runtime clocl bash"
 
 # Use main package to pull in full support
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 S = "${WORKDIR}/git/host"
 
 export WANT_LLVM_RELEASE = "3.6-ti"
 
-OCL_BUILD_TARGET_dra7xx = "ARM_AM57"
+OCL_BUILD_TARGET:dra7xx = "ARM_AM57"
 
 ENABLE_ULM = "1"
 SHMEM_MANAGER = "CMEM"
@@ -61,19 +61,19 @@ EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${ST
 export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 
 MCTD = ""
-MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
+MCTD:dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${systemd_system_unitdir}
     install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
 }
 
 SYSTEMD_PACKAGES = "${PN}-runtime"
-SYSTEMD_SERVICE_${PN}-runtime = "ti-mct-daemon.service"
-SYSTEMD_AUTO_ENABLE_${PN}-runtime = "${@oe.utils.conditional("RESERVE_CMEM", "1", "enable", "disable", d)}"
+SYSTEMD_SERVICE:${PN}-runtime = "ti-mct-daemon.service"
+SYSTEMD_AUTO_ENABLE:${PN}-runtime = "${@oe.utils.conditional("RESERVE_CMEM", "1", "enable", "disable", d)}"
 
-FILES_${PN}-runtime += "${bindir} ${systemd_system_unitdir} ${sysconfdir}/ti-mctd ${libdir}/lib*${SOLIBS}"
+FILES:${PN}-runtime += "${bindir} ${systemd_system_unitdir} ${sysconfdir}/ti-mctd ${libdir}/lib*${SOLIBS}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/ti/opencl/* \
 "
diff --git a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
index 8cb25da2..4d78e7b7 100644
--- a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
+++ b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
@@ -5,13 +5,13 @@ include openmpacc.inc
 PR = "${INC_PR}.0"
 
 DEPENDS = "boost elfutils perl-native"
-RDEPENDS_${PN} += "clocl"
+RDEPENDS:${PN} += "clocl"
 
 S = "${WORKDIR}/git/host"
 
-TARGET_class-target = "clacc_arm"
-TARGET_class-native = "clacc_x86"
-TARGET_class-nativesdk = "clacc_x86"
+TARGET:class-target = "clacc:arm"
+TARGET:class-native = "clacc:x86"
+TARGET:class-nativesdk = "clacc:x86"
 
 export LINUX_DEVKIT_ROOT = "${STAGING_DIR_HOST}"
 export X86_HOST_ROOT = "${STAGING_DIR_HOST}"
diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
index 39902f8f..260daf03 100644
--- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
@@ -5,7 +5,7 @@ include openmpacc.inc
 PR = "${INC_PR}.1"
 
 DEPENDS = "openmpacc clacc-native clocl-native ti-cgt6x-native"
-RDEPENDS_${PN} += "opencl-runtime"
+RDEPENDS:${PN} += "opencl-runtime"
 
 S = "${WORKDIR}/git/openmpacc-examples-src"
 
@@ -24,7 +24,7 @@ OMPACC_EXAMPLE_LIST = " target_update \
                         sub_section \
 "
 
-python do_unpack_append() {
+python do_unpack:append() {
     import shutil
 
     git_dir = d.expand("${WORKDIR}/git/examples")
@@ -68,12 +68,12 @@ do_install() {
     done
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${datadir}/ti/examples/openmpacc \
 "
 
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
     ${datadir}/ti/examples/openmpacc/*/.debug \
 "
 
-INSANE_SKIP_${PN} = "arch ldflags textrel staticdev"
+INSANE_SKIP:${PN} = "arch ldflags textrel staticdev"
diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
index 1c01f5ac..7bcccb13 100644
--- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
+++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
@@ -5,8 +5,8 @@ LICENSE = "BSD"
 inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "dsp"
-REQUIRED_MACHINE_FEATURES_class-native = ""
-REQUIRED_MACHINE_FEATURES_class-nativesdk = ""
+REQUIRED_MACHINE_FEATURES:class-native = ""
+REQUIRED_MACHINE_FEATURES:class-nativesdk = ""
 REQUIRED_DISTRO_FEATURES = "opencl openmp"
 
 PV = "1.5.6.0"
@@ -14,7 +14,7 @@ INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=aaa2a0939d08197132fc382e97b62eb0"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/openmpacc:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/openmpacc:"
 
 OMPACC_GIT_URI = "git://git.ti.com/openmp/ti-openmpacc.git"
 OMPACC_GIT_PROTOCOL = "git"
diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb
index 44b59a4f..7a18e47e 100644
--- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb
+++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb
@@ -7,8 +7,8 @@ PR = "${INC_PR}.1"
 inherit cmake
 
 DEPENDS = "boost boost-native opencl"
-RDEPENDS_${PN} += "opencl-runtime"
-RDEPENDS_${PN}-dev += "clacc"
+RDEPENDS:${PN} += "opencl-runtime"
+RDEPENDS:${PN}-dev += "clacc"
 
 S = "${WORKDIR}/git/host"
 
@@ -17,4 +17,4 @@ export LINUX_DEVKIT_ROOT = "${STAGING_DIR_HOST}"
 
 EXTRA_OECMAKE += "-DVERSION="${PV}" -DBUILD_OUTPUT=lib"
 
-FILES_${PN} += "/usr/share/ti/openmpacc/*"
+FILES:${PN} += "/usr/share/ti/openmpacc/*"
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc
index c70ff8a8..1f6bb442 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc
@@ -16,6 +16,6 @@ S = "${WORKDIR}/git"
 inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "dsp"
-REQUIRED_MACHINE_FEATURES_class-native = ""
-REQUIRED_MACHINE_FEATURES_class-nativesdk = ""
+REQUIRED_MACHINE_FEATURES:class-native = ""
+REQUIRED_MACHINE_FEATURES:class-nativesdk = ""
 REQUIRED_DISTRO_FEATURES = "opencl opencv"
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
index 4dd8c685..27760ebc 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
@@ -20,7 +20,7 @@ DEPENDS = "opencv \
            clocl-native \
 "
 
-RDEPENDS_${PN} += "opencl-runtime \
+RDEPENDS:${PN} += "opencl-runtime \
                    opencv \
 "
 
@@ -49,9 +49,9 @@ do_install() {
     install ${S}/readme.md ${D}${TIDL_INSTALL_DIR}/
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${TIDL_INSTALL_DIR} \
 "
 
 
-INSANE_SKIP_${PN} = "arch ldflags textrel staticdev"
+INSANE_SKIP:${PN} = "arch ldflags textrel staticdev"
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
index d59ee405..96c9d860 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
@@ -18,7 +18,7 @@ DEPENDS = "opencv \
            json-c \
 "
 
-RDEPENDS_${PN} += "tidl-api \
+RDEPENDS:${PN} += "tidl-api \
                    opencl-runtime \
                    opencv \
                    json-c \
@@ -44,9 +44,9 @@ do_install() {
     cp ${CP_ARGS} ${S}/examples/* ${D}${TIDL_INSTALL_DIR}/examples/
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
     ${TIDL_INSTALL_DIR} \
 "
 
 
-INSANE_SKIP_${PN} = "arch ldflags textrel staticdev"
+INSANE_SKIP:${PN} = "arch ldflags textrel staticdev"
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
index 5690c77e..aa143a7c 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
@@ -9,12 +9,12 @@ PR = "${INC_PR}.0"
 
 DEPENDS = "boost boost-native ti-cgt6x-native clocl-native"
 
-TARGET_class-target = "arm"
-TARGET_class-native = "x86"
-TARGET_class-nativesdk = "x86"
+TARGET:class-target = "arm"
+TARGET:class-native = "x86"
+TARGET:class-nativesdk = "x86"
 
-CXXFLAGS_append_class-native    = " -DPLATFORM_64BIT "
-CXXFLAGS_append_class-nativesdk = " -DPLATFORM_64BIT "
+CXXFLAGS:append:class-native    = " -DPLATFORM_64BIT "
+CXXFLAGS:append:class-nativesdk = " -DPLATFORM_64BIT "
 
 EXTRA_OEMAKE = " -C ${S}/viewer \
                  TARGET=${TARGET} \
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb
index c4c66049..3c1b81ff 100644
--- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb
@@ -22,7 +22,7 @@ EXTRA_MAKE_ARGS = "PLATFORM_BUILD=x86 LINUXENV=x86 LINUX_IMPORT_TOOL=64BIT \
                    PROTOBUF_LIB_DIR=${STAGING_DIR_NATIVE}/usr/lib PROTOBUF_INC_DIR=${STAGING_DIR_NATIVE}/usr/include \
                    FLATBUFFERS_INC_DIR=${STAGING_DIR_NATIVE}$/usr/include/flatbuffers \
                    TF_LITE_GENERATED_PATH=${STAGING_DIR_NATIVE}/usr/include/tensorflow/lite/schema"
-EXTRA_MAKE_ARGS_class-target = "LINUX_BUILD_TOOLS=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} \
+EXTRA_MAKE_ARGS:class-target = "LINUX_BUILD_TOOLS=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} \
                                 PROTOBUF_LIB_DIR=${STAGING_LIBDIR} PROTOBUF_INC_DIR=${STAGING_INCDIR} \
                                 FLATBUFFERS_INC_DIR=${STAGING_INCDIR}/flatbuffers \
                                 TF_LITE_GENERATED_PATH=${STAGING_INCDIR}/tensorflow/lite/schema LINUXENV=oearm"
@@ -41,6 +41,6 @@ do_install () {
     install -m 755 ${S}/modules/ti_dl/utils/tidlModelImport/out/tidl_model_import.out ${D}${bindir}
 }
 
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
index 554cf09a..e8aad51c 100644
--- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
@@ -7,13 +7,13 @@ require ./tidl-utils.inc
 
 LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c"
 
-RDEPENDS_${PN}_class-target += "tidl-api tidl-examples"
+RDEPENDS:${PN}:class-target += "tidl-api tidl-examples"
 
 S = "${WORKDIR}/git"
 
-TARGET_class-target = "arm"
-TARGET_class-native = "x86"
-TARGET_class-nativesdk = "x86"
+TARGET:class-target = "arm"
+TARGET:class-native = "x86"
+TARGET:class-nativesdk = "x86"
 
 CP_ARGS = "-Prf --preserve=mode,timestamps --no-preserve=ownership"
 
@@ -26,9 +26,9 @@ do_install() {
   cp ${CP_ARGS} ${S}/docs/* ${D}${datadir}/ti/tidl/utils/docs/.
 }
 
-FILES_${PN} += "${datadir}/ti/tidl/utils \
+FILES:${PN} += "${datadir}/ti/tidl/utils \
                 ${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"
 
-INSANE_SKIP_${PN} += "build-deps ldflags already-stripped"
+INSANE_SKIP:${PN} += "build-deps ldflags already-stripped"
diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb
index 74006810..ec8355e0 100644
--- a/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb
+++ b/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb
@@ -6,9 +6,9 @@ Same package includes IPC implementation (MessageQ based) needed for communicati
 LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://docs/manifest/TIOVX-APP-HOST_01.00.01.00_manifest.html;md5=247d7c56d783f583bf802490d5c93db3"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append += "\
+SRC_URI:append = "\
      file://setenv.sh \
 "
 
@@ -20,7 +20,7 @@ require recipes-ti/includes/arago-paths.inc
 require tiovx-sys.inc
 
 DEPENDS = "tiovx-sys-iface tiovx-lib-host ti-ipc cmem opencv udev"
-RDEPENDS_${PN} = "tiovx-sys-iface tiovx-sys-iface-firmware tiovx-lib-host ti-ipc cmem"
+RDEPENDS:${PN} = "tiovx-sys-iface tiovx-sys-iface-firmware tiovx-lib-host ti-ipc cmem"
 
 PR = "r3"
 
@@ -52,9 +52,9 @@ do_install () {
 }
 
 PACKAGES += "${PN}-examples"
-FILES_${PN}-examples = "${datadir}/ti/examples/openvx"
-RDEPENDS_${PN}-examples = "tiovx-lib-host-staticdev tiovx-lib-host-dev"
+FILES:${PN}-examples = "${datadir}/ti/examples/openvx"
+RDEPENDS:${PN}-examples = "tiovx-lib-host-staticdev tiovx-lib-host-dev"
 
-FILES_${PN} += "${bindir}/*"
-INSANE_SKIP_${PN} = "ldflags"
-INSANE_SKIP_${PN}-examples = "dev-deps"
+FILES:${PN} += "${bindir}/*"
+INSANE_SKIP:${PN} = "ldflags"
+INSANE_SKIP:${PN}-examples = "dev-deps"
diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb
index 16f23398..71b85d40 100644
--- a/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb
+++ b/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb
@@ -36,7 +36,7 @@ do_install () {
     cp ${CP_ARGS} ${S}/include/TI/* ${D}${includedir}/VX/TI
 }
 
-FILES_${PN}-staticdev = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
+FILES:${PN}-staticdev = "${libdir}"
+FILES:${PN}-dev = "${includedir}"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb
index 80e3fa70..3a900e5f 100644
--- a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb
+++ b/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb
@@ -17,7 +17,7 @@ inherit update-alternatives features_check
 
 REQUIRED_MACHINE_FEATURES = "dsp"
 
-SRC_URI_append += "\
+SRC_URI:append = "\
      file://reload-dsp-fw.sh \
 "
 
@@ -37,15 +37,15 @@ do_install () {
     install -m 0755 ${WORKDIR}/reload-dsp-fw.sh ${D}${bindir}
 }
 
-ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66"
+ALTERNATIVE:${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66"
 ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66"
 ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.openvx"
 ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66"
 ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.openvx"
 ALTERNATIVE_PRIORITY = "20"
 
-FILES_${PN} += "${TIOVX_INSTALL_DIR_RECIPE}/sys-iface/* "
+FILES:${PN} += "${TIOVX_INSTALL_DIR_RECIPE}/sys-iface/* "
 PACKAGES =+ "${PN}-firmware"
-FILES_${PN}-firmware = "${base_libdir}/firmware/*"
+FILES:${PN}-firmware = "${base_libdir}/firmware/*"
 
-INSANE_SKIP_${PN}-firmware = "arch"
+INSANE_SKIP:${PN}-firmware = "arch"
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 06/23] conf/machine: remove generic arago machines
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (4 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 05/23] meta-arago: convert to new override syntax in honister Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 07/23] arago.conf: update curl PACKAGECONFIG Denys Dmytriyenko
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

These haven't been tested in long time and corresponding generic or qemu
machine from OE-Core or meta-arm should be used instead these days.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../conf/machine/arago-armv5.conf             | 18 ----------------
 .../conf/machine/arago-armv7.conf             | 18 ----------------
 .../conf/machine/arago-armv8.conf             | 21 -------------------
 meta-arago-distro/conf/machine/arago.conf     |  1 -
 4 files changed, 58 deletions(-)
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv5.conf
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv7.conf
 delete mode 100644 meta-arago-distro/conf/machine/arago-armv8.conf
 delete mode 120000 meta-arago-distro/conf/machine/arago.conf

diff --git a/meta-arago-distro/conf/machine/arago-armv5.conf b/meta-arago-distro/conf/machine/arago-armv5.conf
deleted file mode 100644
index 6f1c1aa8..00000000
--- a/meta-arago-distro/conf/machine/arago-armv5.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Arago unified/fake machine
-#@DESCRIPTION: Unified/fake Arago machine configuration for TI/Arago ARMv5 platforms
-
-include conf/machine/include/tune-arm926ejs.inc
-
-IMAGE_FSTYPES = "tar.xz"
-
-KERNEL_IMAGETYPE = "zImage"
-UBOOT_LOADADDRESS = "0"
-
-SERIAL_CONSOLE = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2 115200;ttyS3 115200;ttyO0 115200;ttyO1 115200;ttyO2 115200;ttyO3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-arago"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet touchscreen"
diff --git a/meta-arago-distro/conf/machine/arago-armv7.conf b/meta-arago-distro/conf/machine/arago-armv7.conf
deleted file mode 100644
index 408064fa..00000000
--- a/meta-arago-distro/conf/machine/arago-armv7.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Arago unified/fake machine
-#@DESCRIPTION: Unified/fake Arago machine configuration for TI/Arago ARMv7 platforms
-
-include conf/machine/include/tune-cortexa8.inc
-
-IMAGE_FSTYPES = "tar.xz"
-
-KERNEL_IMAGETYPE = "zImage"
-UBOOT_LOADADDRESS = "0"
-
-SERIAL_CONSOLE = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2  115200;ttyS3 115200;ttyO0 115200;ttyO1 115200;ttyO2 115200;ttyO3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-arago"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet touchscreen"
diff --git a/meta-arago-distro/conf/machine/arago-armv8.conf b/meta-arago-distro/conf/machine/arago-armv8.conf
deleted file mode 100644
index fd6147fe..00000000
--- a/meta-arago-distro/conf/machine/arago-armv8.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: Arago unified/fake machine
-#@DESCRIPTION: Unified/fake Arago machine configuration for TI/Arago ARMv7 platforms
-
-include conf/machine/include/arm/arch-armv8.inc
-
-IMAGE_FSTYPES = "tar.xz cpio.xz"
-
-KERNEL_IMAGETYPE = "Image"
-UBOOT_LOADADDRESS = "0"
-
-SERIAL_CONSOLE = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2  115200;ttyS3 115200;ttyO0 115200;ttyO1 115200;ttyO2 115200;ttyO3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-#PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-
-MACHINE_FEATURES = ""
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
-
-RDEPENDS:kernel-base = ""
diff --git a/meta-arago-distro/conf/machine/arago.conf b/meta-arago-distro/conf/machine/arago.conf
deleted file mode 120000
index e8069af4..00000000
--- a/meta-arago-distro/conf/machine/arago.conf
+++ /dev/null
@@ -1 +0,0 @@
-arago-armv5.conf
\ No newline at end of file
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 07/23] arago.conf: update curl PACKAGECONFIG
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (5 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 06/23] conf/machine: remove generic arago machines Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 08/23] uvc-gadget: explicitly specify source branch Denys Dmytriyenko
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

curl recently changed PACKAGECONFIG from ssl to openssl, update accordingly.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 0aab847b..f4e935dc 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -116,7 +116,7 @@ PACKAGECONFIG:append:pn-qtwayland = " examples"
 PACKAGECONFIG:append:pn-qtwebengine = " examples"
 
 # Prefer OpenSSL over GnuTLS for curl due to TSU exemptions
-PACKAGECONFIG:pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} ssl zlib"
+PACKAGECONFIG:pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} openssl zlib"
 
 PACKAGECONFIG:pn-glmark2 = "drm-gles2 wayland-gles2"
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 08/23] uvc-gadget: explicitly specify source branch
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (6 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 07/23] arago.conf: update curl PACKAGECONFIG Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 09/23] kms++: inherit pkgconfig class Denys Dmytriyenko
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

bitbake now requires it, as default master is no longer deterministic.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
index 39f8cb3f..79ec067d 100644
--- a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
+++ b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "UVC gadget userspace sample application"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://uvc-gadget.c;beginline=1;endline=18;md5=414860c3c534dc95d81da9564cfb8d2a"
 
-SRC_URI = "git://git.ideasonboard.org/uvc-gadget.git"
+SRC_URI = "git://git.ideasonboard.org/uvc-gadget.git;branch=master"
 
 PV = "1.1+git${SRCPV}"
 SRCREV = "aa82df887ab995473cd83c89777cdf4bc4685dd0"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 09/23] kms++: inherit pkgconfig class
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (7 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 08/23] uvc-gadget: explicitly specify source branch Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 10/23] packagegroup-arago-base: remove kms++-python Denys Dmytriyenko
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This actually uses pkg-config, so needs to inherit the correct class.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-extras/recipes-graphics/kms++/kms++_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb b/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
index 519b8299..eb39736c 100644
--- a/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
+++ b/meta-arago-extras/recipes-graphics/kms++/kms++_git.bb
@@ -24,7 +24,7 @@ FILES:${PN}-python += "${libdir}/python*/site-packages"
 
 S = "${WORKDIR}/git"
 
-inherit python3native meson update-alternatives
+inherit python3native meson pkgconfig update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE:${PN} = "kmstest"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 10/23] packagegroup-arago-base: remove kms++-python
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (8 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 09/23] kms++: inherit pkgconfig class Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 11/23] ti-test: replace kselftests with kernel-selftest Denys Dmytriyenko
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

As kms++-python is currectly disabled due to missing dependencies.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-base.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
index caa0bc01..31d9ad5b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
@@ -27,6 +27,7 @@ ARAGO_BASE = "\
 "
 
 # these require meta-openembedded/meta-oe layer
+#    kms++-python is not provided yet
 ARAGO_EXTRA = "\
     devmem2 \
     tcpdump \
@@ -34,7 +35,6 @@ ARAGO_EXTRA = "\
     dropbear \
     openssh-sftp-server \
     kms++ \
-    kms++-python \
     can-utils \
     docker \
 "
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 11/23] ti-test: replace kselftests with kernel-selftest
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (9 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 10/23] packagegroup-arago-base: remove kms++-python Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 12/23] linuxptp: make bbappend version-specific Denys Dmytriyenko
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

As kselftests in meta-ti has been replaced with upstream kernel-selftest from meta-oe.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/recipes-core/packagegroups/ti-test.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index bd307220..b6b31143 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -26,7 +26,7 @@ ARAGO_TEST = "\
     smcroute \
     rwmem \
     pulseaudio-misc \
-    kselftests \
+    kernel-selftest \
     procps \
     mtd-utils-ubifs-tests \
     pcitest \
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 12/23] linuxptp: make bbappend version-specific
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (10 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 11/23] ti-test: replace kselftests with kernel-selftest Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 13/23] meta-arago: update ambiguous "BSD" license with "BSD-3-Clause" Denys Dmytriyenko
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This bbappend is specific to TI 3.0 fork and breaks with latest 3.1.1 recipe.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../linuxptp/{linuxptp_%.bbappend => linuxptp_3.0.bbappend}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-arago-distro/recipes-connectivity/linuxptp/{linuxptp_%.bbappend => linuxptp_3.0.bbappend} (100%)

diff --git a/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend b/meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_3.0.bbappend
similarity index 100%
rename from meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_%.bbappend
rename to meta-arago-distro/recipes-connectivity/linuxptp/linuxptp_3.0.bbappend
-- 
2.25.1


^ permalink raw reply	[flat|nested] 24+ messages in thread

* [PATCH 13/23] meta-arago: update ambiguous "BSD" license with "BSD-3-Clause"
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (11 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 12/23] linuxptp: make bbappend version-specific Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 14/23] uboot-config: remove overlayed class Denys Dmytriyenko
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

OE-Core recently removed ambiguous "BSD" license[1] in order for recipes to
be more specific and use the exact variants of BSD. Update meta-arago recipes
with "BSD-3-Clause" as that was the previous default.

[1] https://git.openembedded.org/openembedded-core/commit/?id=14d4c007c49652d836d325a12bdbcd3bfa42e6d5

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb            | 2 +-
 .../recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb              | 2 +-
 .../recipes-apps/image-gallery/image-gallery_git.bb             | 2 +-
 meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb  | 2 +-
 .../recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb      | 2 +-
 .../recipes-connectivity/openntpd/openntpd_3.9p1.bb             | 2 +-
 .../wpa-supplicant/wpa-supplicant-wl18xx.bb                     | 2 +-
 .../recipes-connectivity/wpa-supplicant/wpa-supplicant.inc      | 2 +-
 meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb     | 2 +-
 meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb | 2 +-
 meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb         | 2 +-
 meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb | 2 +-
 meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb     | 2 +-
 .../recipes-core/oprofile-example/oprofile-example_git.bb       | 2 +-
 .../recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb   | 2 +-
 .../ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb        | 2 +-
 .../ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb    | 2 +-
 .../ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb            | 2 +-
 meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb | 2 +-
 meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb | 2 +-
 meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb   | 2 +-
 meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb     | 2 +-
 .../pinmux-utility/pinmux-utility_1.0.1076.3.bb                 | 2 +-
 .../recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb   | 2 +-
 .../recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb   | 2 +-
 meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb       | 2 +-
 meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb         | 2 +-
 meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb          | 2 +-
 .../recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb             | 2 +-
 .../recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb              | 2 +-
 meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb        | 2 +-
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb                   | 2 +-
 meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb         | 2 +-
 meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb      | 2 +-
 meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb          | 2 +-
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb                  | 2 +-
 meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc            | 2 +-
 meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb           | 2 +-
 meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb      | 2 +-
 meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb        | 2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
index 85cf2554..4e3f9443 100644
--- a/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
+++ b/meta-arago-distro/recipes-tisdk/parse-ip/parse-ip.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Script to parse ip address during boot and make it available to the host system using shared partitions"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://init;beginline=3;endline=31;md5=f82ddb19a87f97193d08feacfd0e4903"
 
 COMPATIBLE_MACHINE = "ti33x|ti43x"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
index a8b524ed..5524ffcb 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-setup/ti-tisdk-setup.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Package containing scripts to setup the development host and target board"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://setup.sh;beginline=3;endline=31;md5=fc4b04a33df6d892c9f4d4a9d92b945e"
 
 PR = "r46"
diff --git a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
index 537cec01..9625084b 100644
--- a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
+++ b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Image Gallery"
 HOMEPAGE = "https://gitorious.org/image-gallery"
 SECTION = "multimedia"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9c57cc1cdee589f97cbba69e95a89a15"
 
 require recipes-core/matrix/matrix-gui-paths.inc
diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
index c4eb10ee..84ef96ea 100644
--- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Qt Thermostat Demo"
 HOMEPAGE = "https://gitorious.org/thermostat-demo"
 
-LICENSE = "BSD & CC-BY-SA-2.0 & CC-BY-SA-3.0 & MIT"
+LICENSE = "BSD-3-Clause & CC-BY-SA-2.0 & CC-BY-SA-3.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \
                     file://IMAGE-LICENSE;md5=fce98146123de13a189c234a5e4cfa0d \
                     file://API-LICENSE;md5=5e32280d79a1eab76729c50d79ecfe72 \
diff --git a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
index 5f6279ad..e0f826e9 100644
--- a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
+++ b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
@@ -1,6 +1,6 @@
 SUMMARY = "ARM Benchmarks"
 HOMEPAGE = "https://gforge.ti.com/gf/project/am_benchmarks/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7aefb5e1cffc7b6a3ef18b803f957922"
 SECTION = "system"
 
diff --git a/meta-arago-extras/recipes-connectivity/openntpd/openntpd_3.9p1.bb b/meta-arago-extras/recipes-connectivity/openntpd/openntpd_3.9p1.bb
index 3ee63054..008d4d33 100644
--- a/meta-arago-extras/recipes-connectivity/openntpd/openntpd_3.9p1.bb
+++ b/meta-arago-extras/recipes-connectivity/openntpd/openntpd_3.9p1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
 Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
-LICENSE = "BSD & ISC"
+LICENSE = "BSD-3-Clause & ISC"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=4b4f5158007cc97e6b0e2325bb99854a"
 
 PR = "r0"
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
index 59e64df2..04ae405e 100644
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx.bb
@@ -3,7 +3,7 @@
 
 require wpa-supplicant.inc
 
-LICENSE = "GPLv2 | BSD"
+LICENSE = "GPLv2 | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=292eece3f2ebbaa25608eed8464018a3 \
                     file://../README;md5=3f01d778be8f953962388307ee38ed2b \
                     file://wpa_supplicant.c;beginline=1;endline=17;md5=35e6d71fea6b15f61a9fac935bcf410f"
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index 4ed2d353..dad2b824 100644
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -5,7 +5,7 @@ SUMMARY = "Client for Wi-Fi Protected Access (WPA)"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 BUGTRACKER = "http://hostap.epitest.fi/bugz/"
 SECTION = "network"
-LICENSE = "GPLv2 | BSD"
+LICENSE = "GPLv2 | BSD-3-Clause"
 
 inherit pkgconfig
 
diff --git a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
index 0cd24690..6f38b750 100644
--- a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
+++ b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "AM SysInfo"
 HOMEPAGE = "https://gforge.ti.com/gf/project/am_sysinfo/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://mem_util/mem_util.c;beginline=1;endline=37;md5=8aa8e714ab729cfe8177298af8a5a25d"
 
 SECTION = "system"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index c9440628..578cff50 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Simple Qt web display using webengine"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
 SECTION = "multimedia"
 
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 7cd5c82e..c09e8d35 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matrix GUI Application launcher"
 
-LICENSE = "BSD & MIT"
+LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"
 
 SECTION = "multimedia"
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
index 95f75b52..16d08d1e 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Lighttpd config for Matrix"
 
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
 
 inherit allarch
diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
index 10dfada9..4cc9859a 100644
--- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Simple Application to force a screen refresh"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18"
 SECTION = "multimedia"
 
diff --git a/meta-arago-extras/recipes-core/oprofile-example/oprofile-example_git.bb b/meta-arago-extras/recipes-core/oprofile-example/oprofile-example_git.bb
index dd013c87..ff0347d6 100644
--- a/meta-arago-extras/recipes-core/oprofile-example/oprofile-example_git.bb
+++ b/meta-arago-extras/recipes-core/oprofile-example/oprofile-example_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "OProfile Example"
 HOMEPAGE = "https://gitorious.org/oprofile-example"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://signal_parent.c;beginline=1;endline=37;md5=3c72149bb458105db5d2e6fbcb2da66e"
 
 SECTION = "system"
diff --git a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb b/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
index 97ed0225..943a1b2b 100644
--- a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
+++ b/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI Cryptography Example Applications"
 HOMEPAGE = "http://arago-project.org/git/projects/?p=crypto-example-apps.git;a=summary"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://AES/aes_256.c;beginline=9;endline=35;md5=8edbb4dee965d2f2eb5ca2822addcae5"
 SECTION = "console"
 DEPENDS += "openssl"
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
index 8cbfc7a4..5eaad599 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-app-loader/ti-pru-sw-app-loader_1.00.00.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "PRU sw application loader"
 HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://interface/prussdrv.c;beginline=1;endline=47;md5=6012fea45c1fbced663277bc90d2163a"
 
 RRECOMMENDS:${PN} = "kernel-module-uio-pru"
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
index d41f4a66..88b86d63 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-edma-library/ti-pru-sw-edma-library_1.00.00.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "eDMA library for use by PRU sw example applications"
 HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://edma.c;beginline=1;endline=46;md5=f6bde95a8e2277050e36b257ca9214a6"
 
 DEPENDS += "virtual/kernel"
diff --git a/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb b/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
index 6e602bf0..60bc3d5a 100644
--- a/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
+++ b/meta-arago-extras/recipes-core/ti-pru-sw-examples/ti-pru-sw-examples_1.00.00.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "PRU sw example applications"
 HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=c4fd8ee7443c1b2b6238b4b5df796481"
 DEPENDS = "ti-pru-sw-app-loader ti-pru-sw-edma-library"
 RDEPENDS:${PN} = "ti-pru-sw-edma-driver"
diff --git a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
index da661a91..b783a22b 100644
--- a/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
+++ b/meta-arago-extras/recipes-devtools/cmake/extra-cmake-modules.bb
@@ -1,5 +1,5 @@
 UMMARY = "Extra modules and scripts for CMake"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1"
 
 PV = "1.5.0+gitr${SRCPV}"
diff --git a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
index 9f61ee5f..37842ea0 100644
--- a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
+++ b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Utility to generate specified CPU Load"
 HOMEPAGE = "https://github.com/ptitiano/cpuloadgen"
 
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c6c2eb46c569d0cd7884089fea6b4f31"
 
 PV = "0.93"
diff --git a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
index 3cd0b8e3..d52d5eaf 100644
--- a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
+++ b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Utility for parsing system events"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://eventdump.c;beginline=1;endline=34;md5=23b59be24a88ddc407b553035f3fd3e9"
 
 PR = "r3"
diff --git a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
index 7f63db39..768d5505 100644
--- a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
+++ b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Diagnostic tool for TI OMAP processors"
 HOMEPAGE = "https://github.com/omapconf/omapconf"
 
-LICENSE = "GPLv2 | BSD"
+LICENSE = "GPLv2 | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=205c83c4e2242a765acb923fc766e914"
 
 PV = "1.75+git${SRCPV}"
diff --git a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
index 2dfb731d..0a326a95 100644
--- a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
+++ b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_1.0.1076.3.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Texas Instruments Pinmux Utility"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2b328fcf0477d688d8b85f7310f9e6b9"
 COMPATIBLE_MACHINE = "omapl138"
 
diff --git a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
index c924e8de..75b5b360 100644
--- a/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
+++ b/meta-arago-extras/recipes-devtools/pinmux-utility/pinmux-utility_2.5.2.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Texas Instruments Pinmux Utility"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d69a4aafe4f7b66d5f9c60d6875ebd52"
 COMPATIBLE_MACHINE = "am335x-evm"
 
diff --git a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
index a11d8192..6e3ec7b3 100644
--- a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
+++ b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
@@ -1,6 +1,6 @@
 SUMMARY = "GLSDK example applications"
 HOMEPAGE = "http://git.ti.com/glsdk"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10a9abb9c5bb19edd83a8cf66eef7148"
 
 DEPENDS = "gstreamer1.0 libdrm libdce ti-ipc wayland weston"
diff --git a/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb b/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
index 03b77852..a9fb1098 100644
--- a/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
+++ b/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
@@ -2,7 +2,7 @@ SUMMARY = "Library of simple functions optimized for various CPUs"
 HOMEPAGE = "http://liboil.freedesktop.org/"
 BUGTRACKER = "https://bugs.freedesktop.org/"
 
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
                     file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \
                     file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
index 086497ec..d31f06c9 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-rtos_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL-C compiler for C66x (Linux hosted)"
 HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 require recipes-ti/ocl/ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
index 18d304b7..d1fffae2 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/clocl-win_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL-C compiler for C66x (Windows hosted)"
 HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 require recipes-ti/ocl/ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
index 2aa130ba..883be797 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-examples-rtos_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL example applications"
 HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 require recipes-ti/ocl/ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
index 81ab0fa4..2c53f684 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-monitor-rtos_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL compute device firmware for C66x (RTOS)"
 HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 require recipes-ti/ocl/ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
index aa30b52a..bed29bc1 100644
--- a/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl-rtos/opencl-rtos_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL host runtime (RTOS)"
 HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 require recipes-ti/ocl/ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
index 5638ef4d..9b2a3aa9 100644
--- a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI OpenCL offline C compiler for compute devices"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include ocl.inc
 
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index 7e5aaeb8..98b6b64d 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenCL example applications"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include ocl.inc
 require recipes-ti/includes/ti-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
index 44000977..4ec9a547 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI OpenCL M4/IPU device firmware for AM57x"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index 930d270b..c5bfe36a 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI OpenCL compute device firmware"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include ocl.inc
 require recipes-ti/includes/arago-paths.inc
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 4ee67332..eb708f69 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI OpenCL host runtime and development packages"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include ocl.inc
 
diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
index 7bcccb13..f8774810 100644
--- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
+++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc
@@ -1,6 +1,6 @@
 SUMMARY = "TI OpenMP Accelerator Model"
 HOMEPAGE = "http://downloads.ti.com/mctools/esd/docs/openmpacc/"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 inherit features_check
 
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
index 27760ebc..7f37b63b 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "TIDL API"
 DESCRIPTION = "TIDL API header and library. Refer TIDL API User's Guide for details."
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include tidl-api.inc
 require recipes-ti/includes/ti-paths.inc
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
index 96c9d860..c9756d40 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "TIDL API examples"
 DESCRIPTION = "Examples of TIDL API. Refer TIDL API User's Guide for details."
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include tidl-api.inc
 require recipes-ti/includes/ti-paths.inc
diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
index aa143a7c..644b8626 100644
--- a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
+++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "TIDL Network Viewer"
 DESCRIPTION = "TIDL Network viewer using dot and graphviz"
 HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 include tidl-api.inc
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 14/23] uboot-config: remove overlayed class
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (12 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 13/23] meta-arago: update ambiguous "BSD" license with "BSD-3-Clause" Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 15/23] classes: rename old customized fitimage classes for legacy HS devices Denys Dmytriyenko
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This class was overlayed locally for a fix. The fix since then got accepted
upstream and there's no need to carry it here anymore.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../classes/uboot-config.bbclass              | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 meta-arago-distro/classes/uboot-config.bbclass

diff --git a/meta-arago-distro/classes/uboot-config.bbclass b/meta-arago-distro/classes/uboot-config.bbclass
deleted file mode 100644
index 89ff970f..00000000
--- a/meta-arago-distro/classes/uboot-config.bbclass
+++ /dev/null
@@ -1,57 +0,0 @@
-# Handle U-Boot config for a machine
-#
-# The format to specify it, in the machine, is:
-#
-# UBOOT_CONFIG ??= <default>
-# UBOOT_CONFIG[foo] = "config,images,binary"
-#
-# or
-#
-# UBOOT_MACHINE = "config"
-#
-# Copyright 2013, 2014 (C) O.S. Systems Software LTDA.
-
-UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-
-python () {
-    ubootmachine = d.getVar("UBOOT_MACHINE")
-    ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
-    ubootbinary = d.getVar('UBOOT_BINARY')
-    ubootbinaries = d.getVar('UBOOT_BINARIES')
-    # The "doc" varflag is special, we don't want to see it here
-    ubootconfigflags.pop('doc', None)
-    ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
-
-    if not ubootmachine and not ubootconfig:
-        PN = d.getVar("PN")
-        FILE = os.path.basename(d.getVar("FILE"))
-        bb.debug(1, "To build %s, see %s for instructions on \
-                 setting up your machine config" % (PN, FILE))
-        raise bb.parse.SkipRecipe("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE"))
-
-    if ubootmachine and ubootconfig:
-        raise bb.parse.SkipRecipe("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.")
-
-    if ubootconfigflags and ubootbinaries:
-        raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.")
-
-    if len(ubootconfig) > 0:
-        for config in ubootconfig:
-            for f, v in ubootconfigflags.items():
-                if config == f: 
-                    items = v.split(',')
-                    if items[0] and len(items) > 3:
-                        raise bb.parse.SkipRecipe('Only config,images,binary can be specified!')
-                    d.appendVar('UBOOT_MACHINE', ' ' + items[0])
-                    # IMAGE_FSTYPES appending
-                    if len(items) > 1 and items[1]:
-                        bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1])
-                        d.appendVar('IMAGE_FSTYPES', ' ' + items[1])
-                    if len(items) > 2 and items[2]:
-                        bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % items[2])
-                        d.appendVar('UBOOT_BINARIES', ' ' + items[2])
-                    else:
-                        bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
-                        d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
-                    break
-}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 15/23] classes: rename old customized fitimage classes for legacy HS devices
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (13 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 14/23] uboot-config: remove overlayed class Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 16/23] arago.conf: drop custom class for image checksums Denys Dmytriyenko
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

These classes are used for creating signed FIT images for legacy HS devices
that use custom process that differs from upstream. To avoid conflict with
upstream namespace that is used for K3 HS devices, rename them accordingly.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 ...class => kernel-fitimage-legacyhs.bbclass} |  2 +-
 ...gn.bbclass => uboot-sign-legacyhs.bbclass} |  0
 meta-arago-distro/conf/distro/arago.conf      | 34 +++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)
 rename meta-arago-distro/classes/{kernel-fitimage.bbclass => kernel-fitimage-legacyhs.bbclass} (99%)
 rename meta-arago-distro/classes/{uboot-sign.bbclass => uboot-sign-legacyhs.bbclass} (100%)

diff --git a/meta-arago-distro/classes/kernel-fitimage.bbclass b/meta-arago-distro/classes/kernel-fitimage-legacyhs.bbclass
similarity index 99%
rename from meta-arago-distro/classes/kernel-fitimage.bbclass
rename to meta-arago-distro/classes/kernel-fitimage-legacyhs.bbclass
index f412f4c9..4a006eb6 100644
--- a/meta-arago-distro/classes/kernel-fitimage.bbclass
+++ b/meta-arago-distro/classes/kernel-fitimage-legacyhs.bbclass
@@ -1,4 +1,4 @@
-inherit kernel-uboot uboot-sign
+inherit kernel-uboot uboot-sign-legacyhs
 
 FITIMAGE_HASH_ALGO ?= "sha1"
 FITIMAGE_PACK_TEE ?= "0"
diff --git a/meta-arago-distro/classes/uboot-sign.bbclass b/meta-arago-distro/classes/uboot-sign-legacyhs.bbclass
similarity index 100%
rename from meta-arago-distro/classes/uboot-sign.bbclass
rename to meta-arago-distro/classes/uboot-sign-legacyhs.bbclass
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index f4e935dc..b06c2782 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -36,8 +36,29 @@ SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}"
 #IMAGE_CLASSES += "image_types_md5"
 #IMAGE_FSTYPES += "tar.xz.md5"
 
-# FIT image for secure devices
-KERNEL_CLASSES += "kernel-fitimage"
+# FIT image for legacy secure devices
+KERNEL_CLASSES:append:am335x-hs-evm = " kernel-fitimage-legacyhs"
+KERNEL_CLASSES:append:am437x-hs-evm = " kernel-fitimage-legacyhs"
+KERNEL_CLASSES:append:am57xx-hs-evm = " kernel-fitimage-legacyhs"
+KERNEL_CLASSES:append:dra7xx-hs-evm = " kernel-fitimage-legacyhs"
+
+KERNEL_IMAGETYPES:am335x-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am437x-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:am57xx-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES:dra7xx-hs-evm = "zImage fitImage"
+
+# FIT image for K3 secure devices
+KERNEL_CLASSES:append:am64xx-hs-evm = " kernel-fitimage"
+KERNEL_CLASSES:append:am65xx-hs-evm = " kernel-fitimage"
+KERNEL_CLASSES:append:j7-hs-evm = " kernel-fitimage"
+KERNEL_CLASSES:append:j7200-hs-evm = " kernel-fitimage"
+
+KERNEL_IMAGETYPES:am64xx-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:am65xx-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:j7-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:j7200-hs-evm = "Image fitImage"
+
+# FIT image settings
 FITIMAGE_HASH_ALGO = ""
 FITIMAGE_PACK_TEE = "0"
 FITIMAGE_PACK_TEE:am437x-hs-evm = "1"
@@ -47,15 +68,6 @@ FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
 
-KERNEL_IMAGETYPES:dra7xx-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES:am57xx-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES:am437x-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES:am335x-hs-evm = "zImage fitImage"
-KERNEL_IMAGETYPES:am65xx-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES:am64xx-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES:j7-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES:j7200-hs-evm = "Image fitImage"
-
 # Extra boot files for WIC images
 do_image_wic[depends] += "tisdk-uenv:do_deploy"
 IMAGE_BOOT_FILES += "uEnv.txt"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 16/23] arago.conf: drop custom class for image checksums
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (14 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 15/23] classes: rename old customized fitimage classes for legacy HS devices Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 17/23] meta-arago: set layer compatibility with kirkstone Denys Dmytriyenko
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Use new CONVERSION facility to generate md5sum checksums for images.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/classes/image_types_md5.bbclass | 9 ---------
 meta-arago-distro/conf/distro/arago.conf          | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 meta-arago-distro/classes/image_types_md5.bbclass

diff --git a/meta-arago-distro/classes/image_types_md5.bbclass b/meta-arago-distro/classes/image_types_md5.bbclass
deleted file mode 100644
index 16324ca5..00000000
--- a/meta-arago-distro/classes/image_types_md5.bbclass
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit image_types
-
-COMPRESSIONTYPES += "gz.md5"
-COMPRESS_CMD:gz.md5 = "${COMPRESS_CMD_gz}; md5sum ${IMAGE_NAME}.rootfs.${type}.gz > ${IMAGE_NAME}.rootfs.${type}.gz.md5"
-IMAGE_TYPES += "tar.gz.md5"
-
-COMPRESSIONTYPES += "xz.md5"
-COMPRESS_CMD:xz.md5 = "${COMPRESS_CMD_xz}; md5sum ${IMAGE_NAME}.rootfs.${type}.xz > ${IMAGE_NAME}.rootfs.${type}.xz.md5"
-IMAGE_TYPES += "tar.xz.md5"
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index b06c2782..ade66ea7 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -33,8 +33,7 @@ SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_VERSION}"
 SDKPATH_REAL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_VERSION}"
 SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}"
 
-#IMAGE_CLASSES += "image_types_md5"
-#IMAGE_FSTYPES += "tar.xz.md5"
+IMAGE_FSTYPES += "tar.xz.md5sum"
 
 # FIT image for legacy secure devices
 KERNEL_CLASSES:append:am335x-hs-evm = " kernel-fitimage-legacyhs"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 17/23] meta-arago: set layer compatibility with kirkstone
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (15 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 16/23] arago.conf: drop custom class for image checksums Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 18/23] arago.conf: rename LICENSE_FLAGS_WHITELIST to LICENSE_FLAGS_ACCEPTED Denys Dmytriyenko
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/conf/layer.conf | 2 +-
 meta-arago-extras/conf/layer.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/conf/layer.conf b/meta-arago-distro/conf/layer.conf
index 28d553ed..4e21a517 100644
--- a/meta-arago-distro/conf/layer.conf
+++ b/meta-arago-distro/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-arago-distro"
 BBFILE_PATTERN_meta-arago-distro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arago-distro = "10"
 
-LAYERSERIES_COMPAT_meta-arago-distro = "honister"
+LAYERSERIES_COMPAT_meta-arago-distro = "kirkstone"
 
 LAYERDEPENDS_meta-arago-distro = " \
     core \
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index 50d5f2c9..2132ca18 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-arago-extras"
 BBFILE_PATTERN_meta-arago-extras := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arago-extras = "10"
 
-LAYERSERIES_COMPAT_meta-arago-extras = "honister"
+LAYERSERIES_COMPAT_meta-arago-extras = "kirkstone"
 
 # Set a variable to get to the top of the metadata location
 ARAGOBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 18/23] arago.conf: rename LICENSE_FLAGS_WHITELIST to LICENSE_FLAGS_ACCEPTED
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (16 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 17/23] meta-arago: set layer compatibility with kirkstone Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 19/23] HACK: ti-test: disable input-utils due to build failure Denys Dmytriyenko
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Part of inclusive language changes.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index ade66ea7..b0482e5c 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -211,7 +211,7 @@ ENTERPRISE_DISTRO = "1"
 # disable by default the codecs in libav that causes issues with shipping an
 # Arago based SDK. No need to prevent gst-ffmpeg from being used since we
 # disable troublesome software.
-LICENSE_FLAGS_WHITELIST = "commercial_gst-ffmpeg commercial_gstreamer1.0-libav commercial_faad2 non-commercial_netperf"
+LICENSE_FLAGS_ACCEPTED = "commercial_gst-ffmpeg commercial_gstreamer1.0-libav commercial_faad2 non-commercial_netperf"
 
 # Do not package own copy of perl into devkit, rely on host one
 ASSUME_PROVIDED += "nativesdk-perl"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 19/23] HACK: ti-test: disable input-utils due to build failure
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (17 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 18/23] arago.conf: rename LICENSE_FLAGS_WHITELIST to LICENSE_FLAGS_ACCEPTED Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 20/23] HACK: packagegroup-arago-tisdk-addons: disable pru-pwm-fw for am65x Denys Dmytriyenko
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/recipes-core/packagegroups/ti-test.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index b6b31143..f0efe607 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -50,8 +50,8 @@ ARAGO_TEST:append:armv7ve = " \
 
 #    timestamping
 #    ltp-ddt
+#    input-utils 
 ARAGO_TI_TEST = " \
-    input-utils \
     cpuloadgen \
     uvc-gadget \
     arm-benchmarks \
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 20/23] HACK: packagegroup-arago-tisdk-addons: disable pru-pwm-fw for am65x
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (18 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 19/23] HACK: ti-test: disable input-utils due to build failure Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 21/23] HACK: packagegroup-arago-tisdk-addons: disable pru-swuart-fw for am335x Denys Dmytriyenko
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This requires building FW from sources using PDK, CSL, etc. that have been
deprecated in meta-ti. Disable for now, until binary version can be restored.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../packagegroups/packagegroup-arago-tisdk-addons.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 1c8b9467..60bf372a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -10,7 +10,6 @@ PACKAGES =+ "${PN}-extra"
 
 #    dt
 
-#    kms++-python
 UTILS = " \
     am-sysinfo \
     gdbserver \
@@ -66,7 +65,8 @@ UTILS:append:k3 = " mmc-utils \
 "
 
 UTILS:append:am64xx = " ti-rtos-firmware pru-icss"
-UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
+#UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
+UTILS:append:am65xx = " ti-rtos-firmware pru-icss"
 UTILS:append:j7 = " ti-rtos-firmware"
 UTILS:append:j7-evm = " pru-icss"
 UTILS:append:j7-hs-evm = " pru-icss"
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 21/23] HACK: packagegroup-arago-tisdk-addons: disable pru-swuart-fw for am335x
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (19 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 20/23] HACK: packagegroup-arago-tisdk-addons: disable pru-pwm-fw for am65x Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 22/23] HACK: packagegroup-arago-tisdk-addons: disable pruss-lld-apps for AM3/4/5 Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 23/23] HACK: arago-image: disable make_bootfiles_symlinks_relative postprocess due to bashisms Denys Dmytriyenko
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This requires building FW from sources using PDK, CSL, etc. that have been
deprecated in meta-ti. Disable for now, until binary version can be restored.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../packagegroups/packagegroup-arago-tisdk-addons.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 60bf372a..90f60e1f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -30,10 +30,10 @@ UTILS_DSP = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'gdbc6x dsptop', '', d)} \
 "
 
+#                       pru-swuart-fw 
 UTILS:append:ti33x = " mmc-utils \
                        switch-config \
                        pru-icss \
-                       pru-swuart-fw \
                        uio-module-drv-test \
                        uio-test-pruss \
 "
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 22/23] HACK: packagegroup-arago-tisdk-addons: disable pruss-lld-apps for AM3/4/5
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (20 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 21/23] HACK: packagegroup-arago-tisdk-addons: disable pru-swuart-fw for am335x Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  2022-02-22  4:41 ` [PATCH 23/23] HACK: arago-image: disable make_bootfiles_symlinks_relative postprocess due to bashisms Denys Dmytriyenko
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

This requires building FW from sources using PDK, CSL, etc. that have been
deprecated in meta-ti. Disable for now, until binary version can be restored.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../packagegroups/packagegroup-arago-tisdk-addons.bb        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 90f60e1f..600da50f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -112,10 +112,10 @@ EXTRA_PACKAGES:append:omap-a15 = " \
 "
 
 # acontis-atemsys
-EXTRA_PACKAGES:append:am335x-evm = " pruss-lld-apps"
-EXTRA_PACKAGES:append:am437x-evm = " pruss-lld-apps"
+#EXTRA_PACKAGES:append:am335x-evm = " pruss-lld-apps"
+#EXTRA_PACKAGES:append:am437x-evm = " pruss-lld-apps"
 # acontis-atemsys
-EXTRA_PACKAGES:append:am57xx-evm = " pruss-lld-apps"
+#EXTRA_PACKAGES:append:am57xx-evm = " pruss-lld-apps"
 
 RDEPENDS:${PN} = "\
     ${UTILS} \
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 23/23] HACK: arago-image: disable make_bootfiles_symlinks_relative postprocess due to bashisms
  2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
                   ` (21 preceding siblings ...)
  2022-02-22  4:41 ` [PATCH 22/23] HACK: packagegroup-arago-tisdk-addons: disable pruss-lld-apps for AM3/4/5 Denys Dmytriyenko
@ 2022-02-22  4:41 ` Denys Dmytriyenko
  22 siblings, 0 replies; 24+ messages in thread
From: Denys Dmytriyenko @ 2022-02-22  4:41 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@konsulko.com>

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/recipes-core/images/arago-image.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index 12446185..73c49ce4 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -38,7 +38,7 @@ make_bootfiles_symlinks_relative() {
     done
 }
 
-ROOTFS_POSTPROCESS_COMMAND += "make_bootfiles_symlinks_relative;"
+#ROOTFS_POSTPROCESS_COMMAND += "make_bootfiles_symlinks_relative;"
 
 BAD_RECOMMENDATIONS += " \
     ti-llvm3.6-dev \
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2022-02-22  4:42 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-22  4:41 [PATCH 00/23] initial cleanup and uplift from dunfell to kirkstone Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 01/23] qt-provider/qt-vars: deprecate abstraction between Qt4 and Qt5 Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 02/23] recipes: remove deprecated old platforms Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 03/23] linux-libc-headers: correct the version to be 5.10 Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 04/23] toolchain-gcc: update preferred versions for internal toolchain Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 05/23] meta-arago: convert to new override syntax in honister Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 06/23] conf/machine: remove generic arago machines Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 07/23] arago.conf: update curl PACKAGECONFIG Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 08/23] uvc-gadget: explicitly specify source branch Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 09/23] kms++: inherit pkgconfig class Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 10/23] packagegroup-arago-base: remove kms++-python Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 11/23] ti-test: replace kselftests with kernel-selftest Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 12/23] linuxptp: make bbappend version-specific Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 13/23] meta-arago: update ambiguous "BSD" license with "BSD-3-Clause" Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 14/23] uboot-config: remove overlayed class Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 15/23] classes: rename old customized fitimage classes for legacy HS devices Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 16/23] arago.conf: drop custom class for image checksums Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 17/23] meta-arago: set layer compatibility with kirkstone Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 18/23] arago.conf: rename LICENSE_FLAGS_WHITELIST to LICENSE_FLAGS_ACCEPTED Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 19/23] HACK: ti-test: disable input-utils due to build failure Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 20/23] HACK: packagegroup-arago-tisdk-addons: disable pru-pwm-fw for am65x Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 21/23] HACK: packagegroup-arago-tisdk-addons: disable pru-swuart-fw for am335x Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 22/23] HACK: packagegroup-arago-tisdk-addons: disable pruss-lld-apps for AM3/4/5 Denys Dmytriyenko
2022-02-22  4:41 ` [PATCH 23/23] HACK: arago-image: disable make_bootfiles_symlinks_relative postprocess due to bashisms Denys Dmytriyenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).