layer: convert to new override syntax

This is the result of automated script (0.9.3) conversion:

../openembedded-core/scripts/contrib/convert-overrides.py .

+# meta-toradex-distro
+vars = vars + ["preempt-rt","tdx","upstream"]
+# meta-toradex-* machines
+vars = vars + ["apalis-","colibri-","verdin-","tegra124"]
+# meta-freescale
+vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"]

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

12 files changed, 50 insertions, 50 deletions

diff --git a/buildconf/local.conf b/buildconf/local.conf
index 2c85409..5ced3b0 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -227,8 +227,8 @@ BB_DISKMON_DIRS ??= "\
 # seen. The two lines below enable the SDL backend too. By default libsdl2-native will
 # be built, if you want to use your host's libSDL instead of the minimal libsdl built
 # by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
-PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 #ASSUME_PROVIDED += "libsdl2-native"
 
 #
@@ -250,8 +250,8 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 #
 # To enable fitimage, uncomment the following two lines
 #
-# KERNEL_CLASSES_append = " toradex-fitimage"
-# KERNEL_IMAGETYPE_forcevariable = "${@'zImage' if d.getVar('TORADEX_FLASH_TYPE') == 'rawnand' else 'fitImage'}"
+# KERNEL_CLASSES:append = " toradex-fitimage"
+# KERNEL_IMAGETYPE:forcevariable = "${@'zImage' if d.getVar('TORADEX_FLASH_TYPE') == 'rawnand' else 'fitImage'}"
 
 
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
diff --git a/conf/distro/include/arm-defaults.inc b/conf/distro/include/arm-defaults.inc
index 7f9d3b2..187682f 100644
--- a/conf/distro/include/arm-defaults.inc
+++ b/conf/distro/include/arm-defaults.inc
@@ -30,8 +30,8 @@ def arm_tune_handler(d):
         tune = d.getVar('DEFAULTTUNE')
     return tune
 
-DEFAULTTUNE_tdx := "${@arm_tune_handler(d)}"
+DEFAULTTUNE:tdx := "${@arm_tune_handler(d)}"
 
 DISTRO_ARM_INSTRUCTION ?= "thumb"
-DISTRO_ARM_INSTRUCTION_armv5 ?= "arm"
-ARM_INSTRUCTION_SET_tdx ??= "${DISTRO_ARM_INSTRUCTION}"
+DISTRO_ARM_INSTRUCTION:armv5 ?= "arm"
+ARM_INSTRUCTION_SET:tdx ??= "${DISTRO_ARM_INSTRUCTION}"
diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc
index 80533f0..2aacfca 100644
--- a/conf/distro/include/tdx-base.inc
+++ b/conf/distro/include/tdx-base.inc
@@ -54,7 +54,7 @@ INHERIT += "buildhistory"
 BUILDHISTORY_COMMIT = "1"
 
 # Use bluez5 as default.
-DISTRO_FEATURES_append = " bluez5"
+DISTRO_FEATURES:append = " bluez5"
 
 IMAGE_LINGUAS ?= "en-us"
 
@@ -65,13 +65,13 @@ IMAGE_LINGUAS ?= "en-us"
 #
 # This avoids some annoying errors as follows:
 # | QA Issue: Package version went backwards which would break package feeds
-ERROR_QA_remove = "version-going-backwards"
+ERROR_QA:remove = "version-going-backwards"
 
 # TODO: review default distro features
-DISTRO_FEATURES_append = " pam systemd"
-DISTRO_FEATURES_remove = "sysvinit ptest"
+DISTRO_FEATURES:append = " pam systemd"
+DISTRO_FEATURES:remove = "sysvinit ptest"
 VIRTUAL-RUNTIME_init_manager = "systemd"
-PACKAGECONFIG_append_pn-qemu-native = " libusb"
+PACKAGECONFIG:append:pn-qemu-native = " libusb"
 
 PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv"
 PREFERRED_RPROVIDER_u-boot-fw-utils = "libubootenv"
@@ -80,33 +80,33 @@ PREFERRED_RPROVIDER_u-boot-default-env = "${PREFERRED_PROVIDER_virtual/bootloade
 PREFERRED_PROVIDER_virtual/dtb ?= "device-tree-overlays"
 
 # Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver)
-PREFERRED_VERSION_gstreamer1.0_imx = "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.16.3.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0:imx = "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:imx = "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:imx = "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx = "1.16.3.imx"
 
 # the 1.16.imx variants have their COMPATIBLE set so that they don't build
 # for use-mainline-bsp
-PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp = "1.18%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp = "1.18%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp = "1.18%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp = "1.18%"
+PREFERRED_VERSION_gstreamer1.0:use-mainline-bsp = "1.18%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:use-mainline-bsp = "1.18%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:use-mainline-bsp = "1.18%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-mainline-bsp = "1.18%"
 
 # Override Wayland/Weston Version set in meta-freescale imx-base.inc
-PREFERRED_VERSION_wayland-protocols_mx6 = "1.20.imx"
-PREFERRED_VERSION_wayland-protocols_mx7 = "1.20.imx"
-PREFERRED_VERSION_wayland-protocols_mx8 = "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx6 = "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx7 = "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx8 = "1.20.imx"
 
-PREFERRED_VERSION_weston_mx6 ?= "9.0.0.imx"
-PREFERRED_VERSION_weston_mx7 ?= "9.0.0.imx"
-PREFERRED_VERSION_weston_mx8 ?= "9.0.0.imx"
+PREFERRED_VERSION_weston:mx6 ?= "9.0.0.imx"
+PREFERRED_VERSION_weston:mx7 ?= "9.0.0.imx"
+PREFERRED_VERSION_weston:mx8 ?= "9.0.0.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm_mx6 = "2.4.102.imx"
-PREFERRED_VERSION_libdrm_mx7 = "2.4.102.imx"
-PREFERRED_VERSION_libdrm_mx8 = "2.4.102.imx"
-
-PREFERRED_PROVIDER_opencl-headers_imxgpu      = "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-clhpp_imxgpu        = "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-icd-loader_imxgpu   = "imx-gpu-viv"
-PREFERRED_RPROVIDER_opencl-icd-loader_imxgpu  = "libopencl-imx"
+PREFERRED_VERSION_libdrm:mx6 = "2.4.102.imx"
+PREFERRED_VERSION_libdrm:mx7 = "2.4.102.imx"
+PREFERRED_VERSION_libdrm:mx8 = "2.4.102.imx"
+
+PREFERRED_PROVIDER_opencl-headers:imxgpu      = "imx-gpu-viv"
+PREFERRED_PROVIDER_opencl-clhpp:imxgpu        = "imx-gpu-viv"
+PREFERRED_PROVIDER_opencl-icd-loader:imxgpu   = "imx-gpu-viv"
+PREFERRED_RPROVIDER_opencl-icd-loader:imxgpu  = "libopencl-imx"
diff --git a/conf/distro/tdx-x11-rt.conf b/conf/distro/tdx-x11-rt.conf
index 66669f2..6b21e7f 100644
--- a/conf/distro/tdx-x11-rt.conf
+++ b/conf/distro/tdx-x11-rt.conf
@@ -8,4 +8,4 @@ DISTRO_NAME = "TDX X11 RT"
 DISTROOVERRIDES .= ":preempt-rt"
 DISTRO_FLAVOUR = " (X11 PREEMPT_RT)"
 
-IMAGE_BASENAME_append = "-rt"
+IMAGE_BASENAME:append = "-rt"
diff --git a/conf/distro/tdx-x11-upstream-rt.conf b/conf/distro/tdx-x11-upstream-rt.conf
index 343534e..83914ad 100644
--- a/conf/distro/tdx-x11-upstream-rt.conf
+++ b/conf/distro/tdx-x11-upstream-rt.conf
@@ -8,4 +8,4 @@ DISTRO_NAME = "TDX X11 Upstream RT"
 DISTROOVERRIDES .= ":preempt-rt"
 DISTRO_FLAVOUR = " (X11 UPSTREAM PREEMPT_RT)"
 
-IMAGE_BASENAME_append = "-rt"
+IMAGE_BASENAME:append = "-rt"
diff --git a/conf/distro/tdx-x11-upstream.conf b/conf/distro/tdx-x11-upstream.conf
index 456dfd2..aeaa666 100644
--- a/conf/distro/tdx-x11-upstream.conf
+++ b/conf/distro/tdx-x11-upstream.conf
@@ -10,4 +10,4 @@ DISTRO_FLAVOUR = " (X11 UPSTREAM)"
 
 IMX_DEFAULT_BSP = "mainline"
 
-IMAGE_BASENAME_append = "-upstream"
+IMAGE_BASENAME:append = "-upstream"
diff --git a/conf/distro/tdx-x11.conf b/conf/distro/tdx-x11.conf
index a707f39..47ff7c1 100644
--- a/conf/distro/tdx-x11.conf
+++ b/conf/distro/tdx-x11.conf
@@ -7,19 +7,19 @@ DISTRO = "tdx-x11"
 DISTRO_NAME = "TDX X11"
 DISTRO_FLAVOUR = "(X11)"
 
-IMAGE_BASENAME_append = "-x11"
+IMAGE_BASENAME:append = "-x11"
 
 IMX_DEFAULT_BSP = "nxp"
 
 # Remove conflicting backends.
-DISTRO_FEATURES_remove = "wayland "
+DISTRO_FEATURES:remove = "wayland "
 
 # we use graphics, so set opengl
-DISTRO_FEATURES_append = " opengl"
+DISTRO_FEATURES:append = " opengl"
 
 # These are X11 specific
-DISTRO_FEATURES_append = " x11"
+DISTRO_FEATURES:append = " x11"
 
 # lxqt requires this
-DISTRO_FEATURES_append = " polkit"
+DISTRO_FEATURES:append = " polkit"
 
diff --git a/conf/distro/tdx-xwayland-rt.conf b/conf/distro/tdx-xwayland-rt.conf
index 512875b..e1c08d9 100644
--- a/conf/distro/tdx-xwayland-rt.conf
+++ b/conf/distro/tdx-xwayland-rt.conf
@@ -8,4 +8,4 @@ DISTRO_NAME = "TDX Wayland with XWayland RT"
 DISTROOVERRIDES .= ":preempt-rt"
 DISTRO_FLAVOUR = " (PREEMPT_RT)"
 
-IMAGE_BASENAME_append = "-rt"
\ No newline at end of file
+IMAGE_BASENAME:append = "-rt"
\ No newline at end of file
diff --git a/conf/distro/tdx-xwayland-upstream-rt.conf b/conf/distro/tdx-xwayland-upstream-rt.conf
index 2bf880b..8b3435c 100644
--- a/conf/distro/tdx-xwayland-upstream-rt.conf
+++ b/conf/distro/tdx-xwayland-upstream-rt.conf
@@ -8,4 +8,4 @@ DISTRO_NAME = "TDX Wayland with XWayland Upstream RT"
 DISTROOVERRIDES .= ":preempt-rt"
 DISTRO_FLAVOUR = " (UPSTREAM PREEMPT_RT)"
 
-IMAGE_BASENAME_append = "-rt"
+IMAGE_BASENAME:append = "-rt"
diff --git a/conf/distro/tdx-xwayland-upstream.conf b/conf/distro/tdx-xwayland-upstream.conf
index 6bc703a..739f240 100644
--- a/conf/distro/tdx-xwayland-upstream.conf
+++ b/conf/distro/tdx-xwayland-upstream.conf
@@ -10,4 +10,4 @@ DISTRO_FLAVOUR = " (UPSTREAM)"
 
 IMX_DEFAULT_BSP = "mainline"
 
-IMAGE_BASENAME_append = "-upstream"
+IMAGE_BASENAME:append = "-upstream"
diff --git a/conf/distro/tdx-xwayland.conf b/conf/distro/tdx-xwayland.conf
index b2be0d9..55d4d79 100644
--- a/conf/distro/tdx-xwayland.conf
+++ b/conf/distro/tdx-xwayland.conf
@@ -10,9 +10,9 @@ DISTRO_FLAVOUR = ""
 IMX_DEFAULT_BSP = "nxp"
 
 # we use graphics, so set opengl
-DISTRO_FEATURES_append = " opengl"
+DISTRO_FEATURES:append = " opengl"
 
-DISTRO_FEATURES_append = " wayland x11"
+DISTRO_FEATURES:append = " wayland x11"
 
 # lxqt requires this
-DISTRO_FEATURES_append = " polkit"
+DISTRO_FEATURES:append = " polkit"
diff --git a/scripts/uprev-srcrev b/scripts/uprev-srcrev
index a470795..7f93aad 100755
--- a/scripts/uprev-srcrev
+++ b/scripts/uprev-srcrev
@@ -20,7 +20,7 @@ import scriptutils
 
 logger = scriptutils.logger_create('uprev-srcrev')
 
-recipes_tdxref = [
+recipes:tdxref = [
     "../layers/meta-toradex-bsp-common/recipes-kernel/backports/backports_5.4.bb",
     "../layers/meta-toradex-bsp-common/recipes-kernel/linux/linux-toradex-mainline_5.4.bb",
     "../layers/meta-toradex-bsp-common/recipes-kernel/linux/device-tree-overlays-mainline_git.bb",
@@ -70,7 +70,7 @@ def uprev(args):
     if os.path.exists(os.path.join(script_path, '../../meta-toradex-torizon')):
         recipes = recipes_torizon
     else:
-        recipes = recipes_tdxref
+        recipes = recipes:tdxref
 
     for recipe in recipes:
         logger.info('Processing recipe {}'.format(recipe))