80 files changed, 185 insertions, 185 deletions

diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 9e2c25557..a246622a3 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -66,7 +66,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8c
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63 = "bc649096ad3928ec06a8713b8d787eac"
 
-FSL_EULA_FILE_MD5SUMS = " \
+FSL_EULA_FILE_MD5SUMS = "\
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11} \
diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass
index d30b47a3b..2c9b44f44 100644
--- a/classes/image_populate_mfgtool.bbclass
+++ b/classes/image_populate_mfgtool.bbclass
@@ -41,8 +41,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-MFGTOOL_FILESPATH ??= " \
-    ${@base_set_filespath(["%s/mfgtool" % p for p in "${BBPATH}".split(":")] \
+MFGTOOL_FILESPATH ??= "\
+    ${@base_set_filespath(["%s/mfgtool"% p for p in "${BBPATH}".split(":")] \
                              + ["${FILE_DIRNAME}/${BP}/mfgtool", \
                                 "${FILE_DIRNAME}/${BPN}/mfgtool", \
                                 "${FILE_DIRNAME}/files/mfgtool"] \
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 5365e5fd7..345f71035 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -32,21 +32,21 @@ ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-o
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 
 IMX_BOOT_CONTAINER_FIRMWARE_SOC ?= ""
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = "\
     signed_dp_imx8m.bin \
     signed_hdmi_imx8m.bin \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
     ${OEI_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE ?= " \
+IMX_BOOT_CONTAINER_FIRMWARE ?= "\
     ${IMX_BOOT_CONTAINER_FIRMWARE_SOC} \
     ${DDR_FIRMWARE_NAME} \
 "
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index f338bf829..38a607778 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -19,12 +19,12 @@ IMAGE_ROOTFS_SIZE ?= "8192"
 IMAGE_NAME_SUFFIX = ""
 
 # Filesystems enabled by default
-DEFAULT_FS_SUPPORT = " \
+DEFAULT_FS_SUPPORT = "\
     mtd \
     extfs \
 "
 
-IMAGE_FEATURES = " \
+IMAGE_FEATURES = "\
     ${DEFAULT_FS_SUPPORT} \
     \
     read-only-rootfs \
@@ -38,6 +38,6 @@ USE_DEVFS = "1"
 
 inherit core-image
 
-CORE_IMAGE_BASE_INSTALL = " \
+CORE_IMAGE_BASE_INSTALL = "\
     ${CORE_IMAGE_EXTRA_INSTALL} \
 "
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
index 7c5303066..8415a3ea9 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -3,7 +3,7 @@ DEPENDS = "gcc-arm-none-eabi-native"
 
 inherit deploy
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${@bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', 'ecc', '', d)}"
 
 PACKAGECONFIG[ecc] = ""
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
index 65f0a0e0c..e33cd1829 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -18,7 +18,7 @@ SYSTEM_MANAGER_CONFIG ?= "INVALID"
 
 LDFLAGS[unexport] = "1"
 
-EXTRA_OEMAKE = " \
+EXTRA_OEMAKE = "\
     CONFIG=${SYSTEM_MANAGER_CONFIG} \
     SM_CROSS_COMPILE=arm-none-eabi- \
     V=1 \
diff --git a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
index ea4622612..5490f6881 100644
--- a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
+++ b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
@@ -4,7 +4,7 @@ PACKAGES += "\
     ${PN}-f2fs \
 "
 
-RDEPENDS:${PN}-f2fs = " \
+RDEPENDS:${PN}-f2fs = "\
     ${PN}-base \
     f2fs-tools \
 "
diff --git a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
index fb90c73e1..20b03e12a 100644
--- a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
+++ b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG:imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'glx x11', \
                                                        '', d), d)} \
diff --git a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
index e07d0d542..e4401bf9a 100644
--- a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG:imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= "\
     cogl-pango gles2 \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'egl-x11', \
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
index 364c91bcc..e1f28c53b 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022"
 DEPENDS = "sg3-utils"
 
 SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6"
-SRC_URI = " \
+SRC_URI = "\
     git://github.com/Freescale/utp_com;protocol=https;branch=master \
 "
 
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
index 724d0ff53..2b766b199 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Add packages for opencv i.MX build"
 
 inherit packagegroup
 
-OPENCV_PKGS = " \
+OPENCV_PKGS = "\
     opencv-apps \
     opencv-samples \
     python3-opencv \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${OPENCV_PKGS} \
 "
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
index 534d37627..111bd931a 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     lmbench \
     bonnie++ \
     dbench \
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 2706dca97..c8095100c 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -15,7 +15,7 @@ SOC_TOOLS_TEST:imx-nxp-bsp = "imx-test"
 SOC_TOOLS_TEST:imxgpu  = "imx-test imx-gpu-viv-demos"
 SOC_TOOLS_TEST:qoriq = "ceetm optee-test-qoriq"
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     alsa-utils \
     alsa-tools \
     dosfstools \
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
index deb67f64e..d28c13b90 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -113,7 +113,7 @@ LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
 EXTRA_OECMAKE:append:x86 = " -DX86=ON"
 # disable sse4.1 and sse4.2 to fix 32bit build failure
 # https://github.com/opencv/opencv/issues/21597
-EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
+EXTRA_OECMAKE:remove:x86 = "-DENABLE_SSE41=1 -DENABLE_SSE42=1"
 
 PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index e450e568e..80aaa88fa 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -23,7 +23,7 @@ PACKAGECONFIG_GL:use-mainline-bsp ?= "gles2 gbm kms"
 
 PACKAGECONFIG_PLATFORM          = ""
 PACKAGECONFIG_PLATFORM:imxgpu2d = "no-opengl linuxfb"
-PACKAGECONFIG_PLATFORM:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu3d = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
        bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                        'eglfs', d), d)}"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index e38bbe070..1efe277c3 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -3,43 +3,43 @@
 # Copyright (C) 2016, 2017 O.S. Systems Software LTDA.
 # Copyright (C) 2017-2018 NXP
 
-PACKAGECONFIG_GRAPHICS:imxpxp = " \
+PACKAGECONFIG_GRAPHICS:imxpxp = "\
     gles2"
-PACKAGECONFIG_GRAPHICS:imxgpu2d = " \
+PACKAGECONFIG_GRAPHICS:imxgpu2d = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
     ${PACKAGECONFIG_GRAPHICS_IMX_GPU}"
-PACKAGECONFIG_GRAPHICS:imxgpu3d = " \
+PACKAGECONFIG_GRAPHICS:imxgpu3d = "\
     gles2 \
     ${PACKAGECONFIG_GRAPHICS_IMX_GPU}"
 PACKAGECONFIG_GRAPHICS_IMX_GPU = ""
-PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = "\
     gbm kms"
-PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = " \
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = "\
     gbm kms"
 
-PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \
+PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= "\
     gles2 gbm kms"
 
 PACKAGECONFIG += "\
     ${PACKAGECONFIG_PLATFORM}"
 
 PACKAGECONFIG_PLATFORM = ""
-PACKAGECONFIG_PLATFORM:imxgpu2d = " \
+PACKAGECONFIG_PLATFORM:imxgpu2d = "\
     no-opengl \
     linuxfb \
     ${PACKAGECONFIG_PLATFORM_EGLFS}"
-PACKAGECONFIG_PLATFORM:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu3d = "\
     ${PACKAGECONFIG_PLATFORM_EGLFS}"
 
 PACKAGECONFIG_PLATFORM_EGLFS = ""
-PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
        bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                        'eglfs', d), d)}"
-PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \
+PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = "\
     eglfs"
 
-PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \
+PACKAGECONFIG_PLATFORM:use-mainline-bsp = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
 
 PACKAGECONFIG += "\
@@ -49,7 +49,7 @@ PACKAGECONFIG_WAYLAND = "wayland"
 PACKAGECONFIG += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"
 PACKAGECONFIG_VULKAN = ""
-PACKAGECONFIG_VULKAN:imxgpu = " \
+PACKAGECONFIG_VULKAN:imxgpu = "\
     ${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG_VULKAN_IMX_GPU               = ""
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
diff --git a/recipes-bsp/atf/qoriq-atf_2.12.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 0a64ab740..f523fe352 100644
--- a/recipes-bsp/atf/qoriq-atf_2.12.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -68,7 +68,7 @@ EXTRA_OEMAKE += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'fuse', 'fip_fuse FUSE_PROG=1 FUSE_PROV_FILE=fuse_scr.bin', '', d)} \
 "
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \
 "
 PACKAGECONFIG[optee] = ",,optee-os-qoriq"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.31.bb b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
index 0847a96c0..288fa13bc 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
@@ -164,7 +164,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
 PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-coda980 ${PN}-vpu-wave511 ${PN}-vpu-wave"
 
 FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
-FILES:${PN}-hdmi = " \
+FILES:${PN}-hdmi = "\
     ${nonarch_base_libdir}/firmware/hdmitxfw.bin \
     ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
     ${nonarch_base_libdir}/firmware/dpfw.bin \
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index a285ba22a..aa8717d39 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -37,7 +37,7 @@ do_install() {
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
 
-PACKAGES =+ " \
+PACKAGES =+ "\
     ${PN}-all-pcie \
     ${PN}-all-sdio \
     ${PN}-all-usb \
@@ -55,7 +55,7 @@ PACKAGES =+ " \
     ${PN}-nxpiw612-sdio \
 "
 
-RDEPENDS:${PN}-all-sdio = " \
+RDEPENDS:${PN}-all-sdio = "\
     ${PN}-nxp8987-sdio \
     ${PN}-nxp8997-sdio \
     ${PN}-nxp9098-sdio \
@@ -64,21 +64,21 @@ RDEPENDS:${PN}-all-sdio = " \
     ${PN}-nxpiw612-sdio \
 "
 
-RDEPENDS:${PN}-all-pcie = " \
+RDEPENDS:${PN}-all-pcie = "\
     ${PN}-nxp9098-pcie \
     ${PN}-nxpaw693-pcie \
 "
 
-RDEPENDS:${PN}-all-usb = " \
+RDEPENDS:${PN}-all-usb = "\
     ${PN}-nxpiw610-usb \
 "
 
-FILES:${PN}-nxp-common = " \
+FILES:${PN}-nxp-common = "\
     ${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf \
     ${nonarch_base_libdir}/firmware/nxp/helper_uart_3000000.bin \
 "
 
-FILES:${PN}-nxp8987-sdio = " \
+FILES:${PN}-nxp8987-sdio = "\
     ${nonarch_base_libdir}/firmware/nxp/*8987* \
 "
 RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common"
@@ -86,11 +86,11 @@ RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 
-FILES:${PN}-nxp8997-sdio = " \
+FILES:${PN}-nxp8997-sdio = "\
     ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
 "
 
-FILES:${PN}-nxp9098-common = " \
+FILES:${PN}-nxp9098-common = "\
     ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
     ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \
     ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \
@@ -100,7 +100,7 @@ RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RREPLACES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RCONFLICTS:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 
-FILES:${PN}-nxp9098-pcie = " \
+FILES:${PN}-nxp9098-pcie = "\
     ${nonarch_base_libdir}/firmware/nxp/pcie*9098* \
 "
 RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common"
@@ -108,7 +108,7 @@ RPROVIDES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 
-FILES:${PN}-nxp9098-sdio = " \
+FILES:${PN}-nxp9098-sdio = "\
     ${nonarch_base_libdir}/firmware/nxp/sd*9098* \
 "
 RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
@@ -122,7 +122,7 @@ FILES:${PN}-nxpaw693-pcie += "\
 "
 RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
 
-FILES:${PN}-nxpiw416-sdio = " \
+FILES:${PN}-nxpiw416-sdio = "\
     ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
     ${nonarch_base_libdir}/firmware/nxp/*iw416* \
 "
@@ -148,7 +148,7 @@ FILES:${PN}-nxpiw610-usb += "\
 "
 RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
 
-FILES:${PN}-nxpiw612-sdio = " \
+FILES:${PN}-nxpiw612-sdio = "\
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_*.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \
diff --git a/recipes-bsp/imx-atf/imx-atf_2.12.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index 27984aeea..84f29975c 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.12.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -16,7 +16,7 @@ SRCREV = "4a2e9ef5f9f185bda68470b46365add008903b8c"
 
 inherit deploy
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} \
     ${@bb.utils.filter('MACHINE_FEATURES', 'optee', d)}"
 
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 49d7ffb4b..c8e076407 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -25,7 +25,7 @@ DEPENDS += "\
 do_compile[deptask] = "do_deploy"
 do_compile[depends] += "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_INITRAMFS}:do_build', '', d)}"
 
-CRRM_DEPLOY_DEPENDS ?= " \
+CRRM_DEPLOY_DEPENDS ?= "\
     virtual/kernel \
     ${CRRM_INITRAMFS}"
 CRRM_INITRAMFS ??= "imx-image-crrm-initramfs"
@@ -81,30 +81,30 @@ SOC_FAMILY:mx95-generic-bsp   = "mx95"
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
 MKIMAGE_EXTRA_ARGS ?= ""
-MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= " \
+MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= "\
     OEI=YES \
     LPDDR_TYPE=${DDR_TYPE} \
     MSEL=${MSEL_TYPE} \
 "
-MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
+MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= "\
     OEI=YES \
     LPDDR_TYPE=${DDR_TYPE} \
     ${@'LPDDR_FW_VERSION='+d.getVar('LPDDR_FW_VERSION') if d.getVar('LPDDR_FW_VERSION') else ''} \
     ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
-MKIMAGE_EXTRA_ARGS:imx95-19x19-lpddr5-frdm-pro ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-19x19-lpddr5-frdm-pro ?= "\
     ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
     QSPI_HEADER=./scripts/fspi_header-W25Q512NWEIQ"
 
-MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= "\
     ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
     QSPI_HEADER=./scripts/fspi_header_133"
-MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= "\
     ${MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin} \
 "
 
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
 
-CRRM_FILES = " \
+CRRM_FILES = "\
     ${KERNEL_IMAGETYPE}.gz \
     ${KERNEL_IMAGETYPE}_crrm.gz \
     ${KERNEL_DEVICETREE_BASENAME}.dtb \
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
index bb045b6fb..7ca89431a 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
 
-DEPENDS = " mbedtls openssl"
+DEPENDS = "mbedtls openssl"
 
 SRC_URI = "${SECURE_ENCLAVE_LIB_SRC};branch=${SRCBRANCH}"
 SECURE_ENCLAVE_LIB_SRC ?= "git://github.com/NXP/imx-secure-enclave.git;protocol=https"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index 647a9d768..7095ce7a1 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -11,7 +11,7 @@ PACKAGES =+ "${PN}-crrm"
 
 RDEPENDS:${PN} = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${PN}-crrm', '', d)}"
 
-FILES:${PN}-crrm = " \
+FILES:${PN}-crrm = "\
     ${bindir}/ele_crrm_test \
     ${libdir}/lib*crrm${SOLIBS}"
 
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
index 528b05e17..e47bc87a5 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 
 inherit fsl-eula-unpack
 
-SRC_URI = " ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 IMX_SRCREV_ABBREV = "5e18a84"
 
 SRC_URI[sha256sum] = "04d2a9c5c75804a11a4500a0133dfc7d8e84f74254cee52c42075f5ecc229550"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
index d24ab66ea..cd1094b13 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
@@ -17,11 +17,11 @@ PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
 PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
 PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
 
-EXTRA_OEMAKE = " \
-    CROSS_COMPILE="${HOST_PREFIX}" \
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
-    CTRLSW_HDRPATH="${STAGING_INCDIR}" \
-    PLATFORM="${PLATFORM}" \
+EXTRA_OEMAKE = "\
+    CROSS_COMPILE="${HOST_PREFIX}"\
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}"\
+    CTRLSW_HDRPATH="${STAGING_INCDIR}"\
+    PLATFORM="${PLATFORM}"\
 "
 
 do_install () {
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
index 9cc366835..f2629b9d4 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 
 PROVIDES = "virtual/imxvpu"
 
-SRC_URI = " \
+SRC_URI = "\
     ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
 "
 IMX_SRCREV_ABBREV = "52c7e45"
@@ -29,10 +29,10 @@ PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
 #|  2086 |             ref_data = ref.virtual_address;
 
 CFLAGS += "-Wno-error=incompatible-pointer-types"
-EXTRA_OEMAKE = " \
-    CROSS_COMPILE="${HOST_PREFIX}" \
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
-    PLATFORM="${PLATFORM}" \
+EXTRA_OEMAKE = "\
+    CROSS_COMPILE="${HOST_PREFIX}"\
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}"\
+    PLATFORM="${PLATFORM}"\
 "
 
 do_install () {
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
index 8b5d27f4f..52ff9c359 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
@@ -83,7 +83,7 @@ do_install() {
 FILES_SOLIBSDEV = ""
 FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
 FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
-FILES_SOLIBS_VERSIONED = " \
+FILES_SOLIBS_VERSIONED = "\
     ${libdir}/libcppnetlib-client-connections.so \
     ${libdir}/libcppnetlib-server-parsers.so \
     ${libdir}/libcppnetlib-uri.so \
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
index a94d6bf14..c1c720073 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
@@ -47,7 +47,7 @@ CACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${CACHED_DMA_HEAP_DEVICE_NOD
 UNCACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${UNCACHED_DMA_HEAP_DEVICE_NODE_PATH} \
                           --dma-heap-uncached-memory"
 
-PACKAGECONFIG ?= " "
+PACKAGECONFIG ?= ""
 PACKAGECONFIG:append:imxgpu2d         = " ${LIBG2D_PACKAGECONFIG}"
 PACKAGECONFIG:append:imxipu           = " ipu"
 PACKAGECONFIG:append:imxpxp           = " pxp"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index 11e5ea0ff..9f8841842 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -6,7 +6,7 @@ PROVIDES += "u-boot"
 inherit fsl-u-boot-localversion
 
 LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
     file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
     file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
diff --git a/recipes-core/udev/udev-rules-imx.bb b/recipes-core/udev/udev-rules-imx.bb
index cd8d5ccb6..bec39e46f 100644
--- a/recipes-core/udev/udev-rules-imx.bb
+++ b/recipes-core/udev/udev-rules-imx.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI = " file://10-imx.rules"
+SRC_URI = "file://10-imx.rules"
 
 S = "${UNPACKDIR}"
 
diff --git a/recipes-devtools/qemu/qemu-qoriq.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index b52eb77a1..6c3b3d70b 100644
--- a/recipes-devtools/qemu/qemu-qoriq.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
@@ -76,7 +76,7 @@ do_install_ptest() {
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
     --prefix=${prefix} \
     --bindir=${bindir} \
     --includedir=${includedir} \
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index 8996a2f44..222fc5b47 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -49,7 +49,7 @@ do_install_ptest() {
             ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env
 }
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     fdt sdl kvm aio libusb vhost numa \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
 "
diff --git a/recipes-devtools/uuu/uuu-bin_1.5.233.bb b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
index ec2f40e00..b0fcbc09a 100644
--- a/recipes-devtools/uuu/uuu-bin_1.5.233.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
@@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
                     file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68"
 
-SRC_URI = " \
+SRC_URI = "\
     https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \
     https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_x86;downloadfilename=uuu-${PV}_mac_x86;name=Mac_x86 \
     https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_arm;downloadfilename=uuu-${PV}_mac_arm;name=Mac_arm \
diff --git a/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
index 7b3c2f606..9d4aa4c5c 100644
--- a/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
+++ b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
@@ -24,7 +24,7 @@ inherit cmake python3native
 
 DEPENDS = "spirv-tools"
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DENABLE_PCH=OFF \
diff --git a/recipes-extended/dpdk/dpdk_22.11.bb b/recipes-extended/dpdk/dpdk_22.11.bb
index 84bda4770..b25ce270c 100644
--- a/recipes-extended/dpdk/dpdk_22.11.bb
+++ b/recipes-extended/dpdk/dpdk_22.11.bb
@@ -25,7 +25,7 @@ DPDK_EXAMPLES ?= "l2fwd,l3fwd,l2fwd-crypto,ipsec-secgw,ip_fragmentation,ip_reass
 DPDK_APPS ?= "pdump,test-pmd,proc-info,test-crypto-perf"
 
 # kernel module is provide by dpdk-module recipe, so disable here
-EXTRA_OEMESON = " \
+EXTRA_OEMESON = "\
         -Denable_kmods=false \
         -Doptimization=3 \
         --cross-file ${S}/config/arm/arm64_poky_linux_gcc \
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index a8e229aee..746202820 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -28,7 +28,7 @@ SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
            file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \
           "
 
-DEPENDS = " \
+DEPENDS = "\
     make-native \
     python3-mako-native \
     python3-mako \
@@ -103,7 +103,7 @@ RDEPENDS:${PN} += "\
     python3-mmap \
 "
 
-RDEPENDS:pyjailhouse = " \
+RDEPENDS:pyjailhouse = "\
     python3-core \
     python3-ctypes \
     python3-fcntl \
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 412667f01..0151ebc52 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/odp:"
 
-SRC_URI = " \
+SRC_URI = "\
 git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \
 git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/platform/linux-dpaa2/flib/qbman \
 git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=${S}/platform/linux-dpaa2/flib/rta \
diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb
index c67ab1303..98816ae60 100644
--- a/recipes-extended/ofp/ofp_git.bb
+++ b/recipes-extended/ofp/ofp_git.bb
@@ -16,7 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "odp"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
     --prefix=/usr \
     --libdir=${libdir} \
     --host=${SIMPLE_TARGET_SYS} \
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 826868442..66ca551ec 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -2,7 +2,7 @@ require secure-obj.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS:remove = " python3-pycryptodomex-native"
+DEPENDS:remove = "python3-pycryptodomex-native"
 DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
 RDEPENDS:${PN} += "secure-obj-module"
 
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index 45e9365da..c19ed5547 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -3,7 +3,7 @@ LICENSE = "TestFloat"
 
 LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=bdb2e8111838a48015c29bd97f5b6145"
 
-SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
+SRC_URI = "http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
             http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
           "
 SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
index 9a86e5013..fd1ccfdef 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
@@ -6,12 +6,12 @@ LICENSE_FLAGS = "commercial"
 
 inherit packagegroup
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     packagegroup-fsl-gstreamer1.0 \
 "
 
 # Plugins from the -ugly collection which require the "commercial" flag in LICENSE_FLAGS_ACCEPTED to be set
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     gstreamer1.0-plugins-ugly-asf \
     gstreamer1.0-libav \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
index 6b2c3ac0e..ab0a396c9 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
@@ -5,7 +5,7 @@ SUMMARY = "FSL Community package group - full set of all GStreamer 1.0 plugins"
 
 inherit packagegroup
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     packagegroup-fsl-gstreamer1.0 \
     ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'packagegroup-fsl-gstreamer1.0-commercial', '', d)} \
     gstreamer1.0-plugins-base-meta \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
index fe34a1942..85cd9ebe3 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
@@ -18,7 +18,7 @@ PACKAGES += "\
 
 MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${PN}-audio \
     ${PN}-video \
     ${PN}-network-base \
@@ -26,18 +26,18 @@ RDEPENDS:${PN} = " \
 "
 
 # List of X11 specific plugins
-GST_X11_PACKAGES = " \
+GST_X11_PACKAGES = "\
     gstreamer1.0-plugins-base-ximagesink \
     gstreamer1.0-plugins-base-xvimagesink \
 "
 
 # List of Wayland specific plugins
-GST_WAYLAND_PACKAGES = " \
+GST_WAYLAND_PACKAGES = "\
     gstreamer1.0-plugins-bad-waylandsink \
 "
 
 # basic plugins required in virtually every pipeline
-RDEPENDS:${PN}-base = " \
+RDEPENDS:${PN}-base = "\
     gstreamer1.0 \
     gstreamer1.0-plugins-base-playback \
     ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '', d)} \
@@ -52,14 +52,14 @@ RDEPENDS:${PN}-base = " \
     ${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-gst1.0-plugin-tools", "", d)} \
 "
 
-RRECOMMENDS:${PN}-base = " \
+RRECOMMENDS:${PN}-base = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', \
                           bb.utils.contains('DISTRO_FEATURES', 'wayland', \
                                             '${GST_WAYLAND_PACKAGES}', '', d), d)} \
 "
 
 # Basic audio plugins: parsers, demuxers, decoders
-RDEPENDS:${PN}-audio = " \
+RDEPENDS:${PN}-audio = "\
     ${PN}-base \
     gstreamer1.0-plugins-base-ogg \
     gstreamer1.0-plugins-good-audioparsers \
@@ -71,7 +71,7 @@ RDEPENDS:${PN}-audio = " \
 "
 
 # Basic video plugins: parsers, demuxers
-RDEPENDS:${PN}-video = " \
+RDEPENDS:${PN}-video = "\
     ${PN}-base \
     gstreamer1.0-plugins-base-subparse \
     gstreamer1.0-plugins-base-theora \
@@ -81,12 +81,12 @@ RDEPENDS:${PN}-video = " \
     gstreamer1.0-plugins-good-matroska \
 "
 
-RRECOMMENDS:${PN}-video = " \
+RRECOMMENDS:${PN}-video = "\
     ${PN}-audio \
 "
 
 # Additional video plugins from the -bad collection
-RDEPENDS:${PN}-video-bad = " \
+RDEPENDS:${PN}-video-bad = "\
     ${PN}-video \
     gstreamer1.0-plugins-bad-mpegpsdemux \
     gstreamer1.0-plugins-bad-mpegtsdemux \
@@ -94,7 +94,7 @@ RDEPENDS:${PN}-video-bad = " \
 "
 
 # Plugins used for diagnostics and debugging of pipelines
-RDEPENDS:${PN}-debug = " \
+RDEPENDS:${PN}-debug = "\
     ${PN}-base \
     gstreamer1.0-plugins-base-audiotestsrc \
     gstreamer1.0-plugins-base-videotestsrc \
@@ -103,14 +103,14 @@ RDEPENDS:${PN}-debug = " \
 "
 
 # Basic networking plugins required by most pipelines that receive and/or send data
-RDEPENDS:${PN}-network-base = " \
+RDEPENDS:${PN}-network-base = "\
     gstreamer1.0-plugins-base-tcp \
     gstreamer1.0-plugins-good-soup \
     gstreamer1.0-plugins-good-udp \
 "
 
 # Additional networking plugins
-RDEPENDS:${PN}-network = " \
+RDEPENDS:${PN}-network = "\
     ${PN}-network-base \
     gstreamer1.0-plugins-good-rtp \
     gstreamer1.0-plugins-good-rtpmanager \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
index 09eac053b..dc51f7203 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
@@ -5,11 +5,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 ISP_PKGS      ?= ""
-ISP_PKGS:mx8mp-nxp-bsp = " \
+ISP_PKGS:mx8mp-nxp-bsp = "\
     isp-imx \
     basler-camera \
     kernel-module-isp-vvcam \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${ISP_PKGS} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
index d0367fdb7..44f1927af 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-PACKAGES = " \
+PACKAGES = "\
     ${PN}-base \
     ${PN}-mtd \
     ${PN}-extfs \
@@ -20,7 +20,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
-RDEPENDS:${PN}-base = " \
+RDEPENDS:${PN}-base = "\
     bash \
     imx-uuc \
     util-linux \
@@ -34,14 +34,14 @@ RDEPENDS:${PN}-base = " \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
 "
 
-RDEPENDS:${PN}-mtd = " \
+RDEPENDS:${PN}-mtd = "\
     ${PN}-base \
     imx-kobs \
     mtd-utils \
     mtd-utils-ubifs \
 "
 
-RDEPENDS:${PN}-extfs = " \
+RDEPENDS:${PN}-extfs = "\
     ${PN}-base \
     e2fsprogs-mke2fs \
     e2fsprogs-e2fsck \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
index 218b9eca8..f14c077fd 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
@@ -44,6 +44,6 @@ NETWORK_TOOLS:append:fsl-lsch3 = " \
         spc \
 "
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${NETWORK_TOOLS} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
index a361a4dd2..172b1e1ab 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -11,7 +11,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 SOC_TOOLS_GPU_X11 = ""
-SOC_TOOLS_GPU_X11:imxgpu2d = " mesa-demos glmark2 gtkperf"
+SOC_TOOLS_GPU_X11:imxgpu2d = "mesa-demos glmark2 gtkperf"
 
 SOC_TOOLS_GPU_FB = ""
 
@@ -20,7 +20,7 @@ SOC_TOOLS_GPU_WAYLAND = ""
 SOC_TOOLS_GPU_XWAYLAND = ""
 SOC_TOOLS_GPU_XWAYLAND:imxgpu2d = "mesa-demos gtkperf"
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "${SOC_TOOLS_GPU_XWAYLAND}", \
        bb.utils.contains("DISTRO_FEATURES",     "wayland", "${SOC_TOOLS_GPU_WAYLAND}", \
        bb.utils.contains("DISTRO_FEATURES",         "x11", "${SOC_TOOLS_GPU_X11}", \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index c7e820adb..11c6a9b55 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -12,7 +12,7 @@ inherit packagegroup
 SOC_TOOLS_GPU = ""
 
 # i.MX6 SoloLite does not support apitrace because of its dependency on gles2.
-SOC_TOOLS_GPU:imxgpu2d = " \
+SOC_TOOLS_GPU:imxgpu2d = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'xserver-xorg-extension-viv-autohdmi', \
                                                        '', d), d)} \
@@ -27,6 +27,6 @@ SOC_TOOLS_GPU:append:imxgpu = " \
     imx-gpu-viv-tools \
 "
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${SOC_TOOLS_GPU} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
index 54a428fdf..ae4683723 100644
--- a/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
+++ b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-ALSA_INSTALL = " \
+ALSA_INSTALL = "\
     alsa-utils \
     alsa-tools \
 "
 
-PULSEAUDIO_INSTALL = " \
+PULSEAUDIO_INSTALL = "\
     pulseaudio-server \
     pulseaudio-module-cli \
     pulseaudio-misc \
@@ -27,7 +27,7 @@ PULSEAUDIO_INSTALL = " \
                                            "", d)} \
 "
 
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "alsa",  "${ALSA_INSTALL}", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio",  "${PULSEAUDIO_INSTALL}", "", d)} \
 "
diff --git a/recipes-graphics/gli/gli_0.8.4.0.bb b/recipes-graphics/gli/gli_0.8.4.0.bb
index 14d6a75ed..f1ab37606 100644
--- a/recipes-graphics/gli/gli_0.8.4.0.bb
+++ b/recipes-graphics/gli/gli_0.8.4.0.bb
@@ -9,7 +9,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://readme.md;beginline=19;endline=20;md5=ab03b667ee630c1abb1add70365a50fb"
 
-SRC_URI = " \
+SRC_URI = "\
     git://github.com/g-truc/gli;protocol=https;branch=master \
 "
 SRCREV = "0c171ee87fcfe35a7e0e0445adef06f92e0b6a91"
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
index bd08639b6..297a5b313 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
@@ -11,12 +11,12 @@ SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b"
 
 inherit cmake pkgconfig perlnative python3native
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     egl \
     ${PACKAGECONFIG_BACKEND} \
     ${PACKAGECONFIG_GPU2D} \
 "
-PACKAGECONFIG_BACKEND = " \
+PACKAGECONFIG_BACKEND = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
        bb.utils.contains('DISTRO_FEATURES',     'x11',    'x11', \
                                                              '', d), d)} \
diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
index 126f12b92..86b8a9f97 100644
--- a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
+++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
@@ -8,7 +8,7 @@ DEPENDS_BACKEND = \
         bb.utils.contains('DISTRO_FEATURES',     'x11',               ' xrandr', \
                                                                              '', d), d)}"
 DEPENDS_MX8       = ""
-DEPENDS_MX8:mx8-nxp-bsp   = " \
+DEPENDS_MX8:mx8-nxp-bsp   = "\
     glslang-native \
     opencv \
     rapidopencl \
@@ -17,10 +17,10 @@ DEPENDS_MX8:mx8-nxp-bsp   = " \
     vulkan-headers \
     vulkan-loader \
 "
-DEPENDS_MX8:mx8mm-nxp-bsp = " \
+DEPENDS_MX8:mx8mm-nxp-bsp = "\
     opencv \
 "
-DEPENDS = " \
+DEPENDS = "\
     assimp \
     cmake-native \
     devil \
@@ -75,7 +75,7 @@ do_compile () {
     FslBuild.py -vvvvv -t sdk --UseFeatures [${FEATURES}] --UseExtensions [${EXTENSIONS}] --Variants [WindowSystem=${WINDOW_SYSTEM}] --BuildThreads ${@oe.utils.parallel_make(d)} -c install --CMakeInstallPrefix ${S}
 }
 
-REMOVALS = " \
+REMOVALS = "\
     GLES2/DeBayer \
     GLES2/DirectMultiSamplingVideoYUV \
     GLES3/DirectMultiSamplingVideoYUV \
@@ -108,7 +108,7 @@ INSANE_SKIP:${PN} += "already-stripped rpaths"
 
 # Unfortunately recipes with an empty main package, like header-only libraries,
 # are not included in the SDK. Use RDEPENDS as a workaround.
-RDEPENDS_EMPTY_MAIN_PACKAGE = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE = "\
     fmt \
     gli \
     glm \
@@ -119,7 +119,7 @@ RDEPENDS_EMPTY_MAIN_PACKAGE = " \
     stb \
 "
 RDEPENDS_EMPTY_MAIN_PACKAGE_MX8       = ""
-RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libxdg-shell', '', d)} \
     rapidopencl \
     rapidopenvx \
diff --git a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
index a5637869a..42d60701c 100644
--- a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
+++ b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
@@ -12,7 +12,7 @@ S = "${UNPACKDIR}/${BP}/ThirdParty/Recipe/xdg-shell"
 
 inherit cmake pkgconfig
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
     -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols \
 "
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index f3650fb57..6cedf2525 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -30,7 +30,7 @@ PROVIDES += "\
     virtual/libopenvg \
     ${EXTRA_PROVIDES} \
 "
-EXTRA_PROVIDES = " \
+EXTRA_PROVIDES = "\
     ${PROVIDES_OPENCL} \
     ${PROVIDES_OPENVX} \
 "
@@ -43,7 +43,7 @@ EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
     virtual/libgbm \
 "
 
-PROVIDES_OPENCL = " \
+PROVIDES_OPENCL = "\
     opencl-headers \
     opencl-clhpp \
     opencl-icd-loader \
@@ -76,7 +76,7 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-PACKAGES =+ " \
+PACKAGES =+ "\
         libgles1-imx libgles1-imx-dev \
         libgles2-imx libgles2-imx-dev \
         libgles3-imx-dev \
@@ -343,11 +343,11 @@ FILES:libvulkan-imx = "\
 FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
 
-FILES:libspirv-imx = " \
+FILES:libspirv-imx = "\
     ${libdir}/libSPIRV_viv${SOLIBS} \
 "
 
-FILES:libopenvx-imx = " \
+FILES:libopenvx-imx = "\
     ${libdir}/libOpenVX${REALSOLIBS} \
     ${libdir}/libOpenVXC${SOLIBS} \
     ${libdir}/libOpenVXU${SOLIBS} \
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index e500a5cd7..37dfc32f0 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -1,11 +1,11 @@
 SUMMARY = "Graphics libraries and driver for i.MX Mali GPU"
 SECTION = "libs"
-DEPENDS = " \
+DEPENDS = "\
     libdrm \
     vulkan-loader \
     wayland \
     wayland-protocols"
-PROVIDES = " \
+PROVIDES = "\
     virtual/egl \
     virtual/libgbm \
     virtual/libgles1 \
@@ -18,7 +18,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 
-PACKAGES =+ " \
+PACKAGES =+ "\
     ${PN}-libegl     ${PN}-libegl-dev \
     ${PN}-libgbm     ${PN}-libgbm-dev \
     ${PN}-libgles1   ${PN}-libgles1-dev \
@@ -33,37 +33,37 @@ FILES:${PN} += "\
     ${nonarch_base_libdir}/firmware"
 FILES_SOLIBSDEV = ""
 INSANE_SKIP:${PN} = "dev-so"
-FILES:${PN}-libegl = " \
+FILES:${PN}-libegl = "\
     ${libdir}/libEGL${SOLIBS}"
-FILES:${PN}-libgbm = " \
+FILES:${PN}-libgbm = "\
     ${libdir}/libgbm${SOLIBS}"
-FILES:${PN}-libgles1 = " \
+FILES:${PN}-libgles1 = "\
     ${libdir}/libGLESv1_CM${SOLIBS}"
-FILES:${PN}-libgles2 = " \
+FILES:${PN}-libgles2 = "\
     ${libdir}/libGLESv2${SOLIBS}"
-FILES:${PN}-opencl-icd = " \
+FILES:${PN}-opencl-icd = "\
     ${sysconfdir}/OpenCL"
 RPROVIDES:${PN}-opencl-icd = "virtual-opencl-icd"
-FILES:${PN}-libvulkan = " \
+FILES:${PN}-libvulkan = "\
     ${sysconfdir}/vulkan"
 RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
 RPROVIDES:${PN}-libvulkan = "virtual-vulkan-icd"
 
-FILES:${PN}-dev = " \
+FILES:${PN}-dev = "\
     ${bindir}/malisc"
-FILES:${PN}-libegl-dev = " \
+FILES:${PN}-libegl-dev = "\
     ${includedir}/EGL \
     ${includedir}/KHR \
     ${libdir}/libEGL${SOLIBSDEV} \
     ${libdir}/pkgconfig/egl.pc"
-FILES:${PN}-libgbm-dev = " \
+FILES:${PN}-libgbm-dev = "\
     ${includedir}/gbm.h \
     ${libdir}/libgbm${SOLIBSDEV} \
     ${libdir}/pkgconfig/gbm.pc"
 
 # Consolidate GLES dev packages
 PACKAGES =+ "${PN}-libgles-dev"
-FILES:${PN}-libgles-dev = " \
+FILES:${PN}-libgles-dev = "\
     ${includedir}/GLES* \
     ${libdir}/libGLES*${SOLIBSDEV} \
     ${libdir}/pkgconfig/gles*.pc"
@@ -78,7 +78,7 @@ RDEPENDS:${PN}-libgles1-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles3-dev = "${PN}-libgles-dev"
 
-FILES:${PN}-opencl-icd-dev = " \
+FILES:${PN}-opencl-icd-dev = "\
     ${bindir}/mali_clcc"
 
 python __anonymous() {
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 7d3e7ca1c..b5487d523 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -9,7 +9,7 @@ SRC_URI:append:imxgpu = " \
 
 REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11"
 
-PACKAGECONFIG:remove = " \
+PACKAGECONFIG:remove = "\
     ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \
     ${PACKAGECONFIG_REMOVE_IF_GPU}"
 PACKAGECONFIG_REMOVE_IF_2D_ONLY          = ""
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 0a4a3a4a4..d95fe6a19 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -4,9 +4,9 @@ SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.pat
             file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
 
 PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
-PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
 
-PACKAGECONFIG_APPEND ?= " \
+PACKAGECONFIG_APPEND ?= "\
     gbm \
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
 PACKAGECONFIG_APPEND:append:imxviv:mx8-nxp-bsp = " opencl"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
index 0118975a5..e2ad0da34 100644
--- a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -29,7 +29,7 @@ PACKAGECONFIG[wayland] = " \
     wayland wayland-native wayland-protocols,,, \
     headless"
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DBUILD_WSI_DISPLAY=0 \
     -DBUILD_WSI_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN=1 \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index fd375271f..f9b39a868 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -10,7 +10,7 @@ PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx"
 PACKAGECONFIG_IMXGPU_GBM          = "gbm"
 PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp      = ""
 PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp      = ""
-PACKAGECONFIG:imxgpu = " \
+PACKAGECONFIG:imxgpu = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',                     'wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', '${PACKAGECONFIG_IMXGPU_X11}', \
                                                                                   '', d), d)} \
diff --git a/recipes-graphics/wayland/wayland-protocols_%.bbappend b/recipes-graphics/wayland/wayland-protocols_%.bbappend
index 762b47a31..041cb491a 100644
--- a/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-NXP_PATCHES = " \
+NXP_PATCHES = "\
     file://0001-unstable-Add-alpha-compositing-protocol.patch \
     file://0002-unstable-Add-hdr10-metadata-protocol.patch \
     file://0003-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch \
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 1b08b1955..4b1dc2b4e 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 
 SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config"
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     no-idle-timeout \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
     ${PACKAGECONFIG_GBM_FORMAT} \
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
index dfe55bc80..7a9c327f2 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
@@ -17,7 +17,7 @@ inherit module
 
 MODULES_MODULE_SYMVERS_LOCATION = "dwe"
 
-DEBUG_PREFIX_MAP:prepend = " \
+DEBUG_PREFIX_MAP:prepend = "\
     -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
     -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index d22b643c7..1ac1e498f 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -10,7 +10,7 @@ RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 KERNEL_MODULE_PROBECONF += "moal"
 module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
 
-SRC_URI = " \
+SRC_URI = "\
     ${MRVL_SRC};branch=${SRCBRANCH} \
     file://0001-mlinux-moal_main-fix-device-wakeup-capability.patch \
 "
diff --git a/recipes-kernel/linux/linux-imx-headers_6.18.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index b6d7f8eb8..79173efab 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.18.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -21,7 +21,7 @@ do_configure[noexec] = "1"
 
 do_compile[noexec] = "1"
 
-IMX_UAPI_HEADERS = " \
+IMX_UAPI_HEADERS = "\
     dma-buf.h \
     hantrodec.h \
     hx280enc.h \
@@ -38,7 +38,7 @@ IMX_UAPI_HEADERS = " \
     videodev2.h \
 "
 
-IMX_UAPI_HEADERS_SOUND = " \
+IMX_UAPI_HEADERS_SOUND = "\
     sound/compress_offload.h \
     sound/compress_params.h \
 "
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 23380142e..5a69da1bd 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-IMX_PATCH = " \
+IMX_PATCH = "\
     file://0001-add-conf-for-multichannel-support-in-imx.patch \
     file://0005-add-ak4458-conf-for-multichannel-support.patch \
     file://0006-add-conf-for-iMX-XCVR-sound-card.patch \
diff --git a/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
index 96a7ce6ab..1af5324ca 100644
--- a/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
+++ b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
@@ -12,7 +12,7 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-rtsp-server glib-2.0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = " \
+SRC_URI = "\
     git://github.com/Gateworks/gst-gateworks-apps;branch=master;protocol=https \
 "
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
index 666770083..8cefd5cbe 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
@@ -26,7 +26,7 @@ DEPENDS += "gstreamer1.0-plugins-base"
 
 inherit gobject-introspection
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${GSTREAMER_ORC} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan x11', d)} \
@@ -197,7 +197,7 @@ inherit use-imx-headers
 PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}"
 PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}"
 
-PACKAGECONFIG_REMOVE ?= " \
+PACKAGECONFIG_REMOVE ?= "\
     dtls vulkan \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'gl', d)} \
 "
@@ -217,7 +217,7 @@ EXTRA_OEMESON += "\
     -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
 
-EXTRA_OEMESON:remove = " \
+EXTRA_OEMESON:remove = "\
     -Dkate=disabled \
 "
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
index dff76babc..d761bc9d6 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
@@ -29,7 +29,7 @@ inherit gobject-introspection
 PACKAGECONFIG_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl glx', '', d)}"
 PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl ${PACKAGECONFIG_X11}', '', d)}"
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${GSTREAMER_ORC} \
     ${PACKAGECONFIG_GL} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
@@ -108,7 +108,7 @@ DEFAULT_PREFERENCE = "-1"
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
 
-SRC_URI:remove = " \
+SRC_URI:remove = "\
     https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
     file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
     file://0003-viv-fb-Make-sure-config.h-is-included.patch \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
index ac26ad4e6..f745947f5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
@@ -30,7 +30,7 @@ RDEPENDS:${PN}-soup += "${MLPREFIX}${@bb.utils.contains('PACKAGECONFIG', 'soup2'
 
 PACKAGECONFIG_SOUP ?= "soup3"
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${GSTREAMER_ORC} \
     ${PACKAGECONFIG_SOUP} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
@@ -93,7 +93,7 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
 
 DEFAULT_PREFERENCE = "-1"
 
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
     file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
index 572901c20..40a7a12d1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
 
-SRC_URI = " \
+SRC_URI = "\
             https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
             "
 
@@ -23,7 +23,7 @@ DEPENDS += "gstreamer1.0-plugins-base"
 
 GST_PLUGIN_SET_HAS_EXAMPLES = "0"
 
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
     ${GSTREAMER_ORC} \
 "
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
index 730479d86..d597e2d59 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
@@ -84,7 +84,7 @@ PTEST_BUILD_HOST_FILES = ""
 
 DEFAULT_PREFERENCE = "-1"
 
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
     file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \
 "
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 48d84cead..b2a323436 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -7,7 +7,7 @@ SECTION = "multimedia"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
 
-DEPENDS = " \
+DEPENDS = "\
     gstreamer1.0 \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-bad \
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 96656f85b..00d86960c 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -13,7 +13,7 @@ S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 
 SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
     -datadir=${base_libdir}/firmware \
     --bindir=/unit_tests \
     ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
diff --git a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
index ca0e8a9a7..a29b00749 100644
--- a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
+++ b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "\
     file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "
 
-SRC_URI = " \
+SRC_URI = "\
         git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
 "
 
@@ -44,7 +44,7 @@ LIBCAMERA_PIPELINES ??= "auto"
 LIBCAMERA_PIPELINES:arm ??= "${ARM_PIPELINES}"
 LIBCAMERA_PIPELINES:aarch64 ??= "${ARM_PIPELINES}"
 
-EXTRA_OEMESON = " \
+EXTRA_OEMESON = "\
     -Dpipelines=${LIBCAMERA_PIPELINES} \
     -Dv4l2=true \
     -Dcam=enabled \
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
index 5ac5d374a..fce6e8d74 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -8,7 +8,7 @@ PV = "1.0+git"
 
 SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
 NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https"
-SRC_URI = " ${NXPAFE_SRC};branch=${SRCBRANCH}"
+SRC_URI = "${NXPAFE_SRC};branch=${SRCBRANCH}"
 
 SRCREV = "7d518eb0b18f7c7faadeb3c3397f8b73f0012f3e"
 
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 7f5a7ffbe..837f5321f 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -2,16 +2,16 @@ FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp:"
 
 SRC_URI:append:imx-nxp-bsp = " ${SRC_URI_IMX}"
 SRC_URI_IMX             = ""
-SRC_URI_IMX:mx6-nxp-bsp = " \
+SRC_URI_IMX:mx6-nxp-bsp = "\
     file://0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch \
     file://daemon.conf \
     file://default.pa"
-SRC_URI_IMX:mx7-nxp-bsp = " \
+SRC_URI_IMX:mx7-nxp-bsp = "\
     ${SRC_URI_IMX:mx6-nxp-bsp} \
     file://0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch"
-SRC_URI_IMX:mx8-nxp-bsp = " \
+SRC_URI_IMX:mx8-nxp-bsp = "\
     ${SRC_URI_IMX:mx6-nxp-bsp}"
-SRC_URI_IMX:mx9-nxp-bsp = " \
+SRC_URI_IMX:mx9-nxp-bsp = "\
     ${SRC_URI_IMX:mx6-nxp-bsp}"
 
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index a5ac0f3a0..61629209d 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
 inherit systemd update-rc.d cmake useradd
 
-SRC_URI = " \
+SRC_URI = "\
     git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https \
     file://tee-supplicant.sh \
 "
 
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DBUILD_SHARED_LIBS=ON \
     -DCFG_USE_PKGCONFIG=ON \
 "
diff --git a/recipes-security/smw/itest_git.bb b/recipes-security/smw/itest_git.bb
index 7885edc30..a50079cab 100644
--- a/recipes-security/smw/itest_git.bb
+++ b/recipes-security/smw/itest_git.bb
@@ -24,9 +24,9 @@ PACKAGECONFIG[ele]      = "-DELE=1,,imx-secure-enclave"
 PACKAGECONFIG[ele-seco] = "-DV2X=1,,imx-secure-enclave-seco"
 PACKAGECONFIG[prime]    = "-DPRIME=1,,imx-secure-enclave-prime"
 
-EXTRA_OECMAKE = " \
-    -DOPENSSL_PATH="${STAGING_DIR_HOST}/usr" \
-    -DELE_LIB_PATH="${STAGING_DIR_HOST}/usr" \
+EXTRA_OECMAKE = "\
+    -DOPENSSL_PATH="${STAGING_DIR_HOST}/usr"\
+    -DELE_LIB_PATH="${STAGING_DIR_HOST}/usr"\
     -DLIB_PATH="${STAGING_DIR_HOST}${libdir}""
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 13202326b..869fbb4a8 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -11,11 +11,11 @@ SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCB
 
 SRCREV = "71cb18f17d766145217a5517748e37e250b055bf"
 
-DEPENDS = " openssl"
+DEPENDS = "openssl"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-EXTRA_OEMAKE = " OPENSSL_PATH=${STAGING_INCDIR}"
+EXTRA_OEMAKE = "OPENSSL_PATH=${STAGING_INCDIR}"
 
 do_install () {
         oe_runmake DESTDIR=${D} install
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb
index 46155978e..115b2e224 100644
--- a/recipes-security/smw/smw_5.3.bb
+++ b/recipes-security/smw/smw_5.3.bb
@@ -9,7 +9,7 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ff20c8e51b28869d9cdec70a818d163f \
                     file://${PSA_ARCH_TESTS_SRC_PATH}/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
 
-DEPENDS = " \
+DEPENDS = "\
     python3-cryptography-native \
     json-c \
     optee-client \
@@ -61,11 +61,11 @@ LD[unexport] = "1"
 # setting the linker options
 TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}"
 
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
     -DYOCTO_BUILD=ON \
     -DTA_DEV_KIT_ROOT=${TA_DEV_KIT_DIR} \
     -DTEEC_ROOT=${STAGING_DIR_HOST} \
-    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \
+    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr"\
     -DPSA_ARCH_TESTS_SRC_PATH=${PSA_ARCH_TESTS_SRC_PATH} \
     -DTEE_TA_DESTDIR=${nonarch_base_libdir} \
 "