34 files changed, 222 insertions, 222 deletions

diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index 479d113e8..9b44fe194 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -18,30 +18,30 @@ LINUX_VERSION_EXTENSION ?= "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCAL
 do_kernel_localversion[dirs] += "${S} ${B}"
 do_kernel_localversion() {
 
-        # Fallback for recipes not able to use LINUX_VERSION_EXTENSION
-        if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then
-                echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >> ${B}/.config
-        fi
+    # Fallback for recipes not able to use LINUX_VERSION_EXTENSION
+    if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then
+        echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >> ${B}/.config
+    fi
 
-        if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
+    if [ "${SCMVERSION}" = "y" ]; then
+        # Add GIT revision to the local version
+        if [ "${SRCREV}" = "INVALID" ]; then
+            hash=${SRCREV_machine}
+        else
+            hash=${SRCREV}
+        fi
+        if [ "$hash" = "AUTOINC" ]; then
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+        else
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+        fi
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
 
-                sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
-                echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
-        fi
+        sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
+        echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
+    fi
 }
 
 addtask kernel_localversion before do_configure after do_patch do_kernel_configme
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index df4ac5fbf..c867c9f85 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -15,24 +15,24 @@ LOCALVERSION ??= "+fslc"
 UBOOT_LOCALVERSION = "${LOCALVERSION}"
 
 do_compile:prepend() {
-        if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
-        else
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
-        fi
+    if [ "${SCMVERSION}" = "y" ]; then
+        # Add GIT revision to the local version
+        if [ "${SRCREV}" = "INVALID" ]; then
+            hash=${SRCREV_machine}
+        else
+            hash=${SRCREV}
+        fi
+        if [ "$hash" = "AUTOINC" ]; then
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+        else
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+        fi
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+    else
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
+    fi
 }
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 63a10f303..65b6a5dbd 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -38,7 +38,7 @@ do_image_wic[depends] += " \
 
 # We need to apply a fixup inside of the partition table
 IMAGE_CMD:wic:append:mxs-generic-bsp() {
-        # Change partition type for mxs processor family
-        bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
-        echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
+    # Change partition type for mxs processor family
+    bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
+    echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
 }
diff --git a/classes/kernel-imximage.bbclass b/classes/kernel-imximage.bbclass
index d432ebb83..999840f69 100644
--- a/classes/kernel-imximage.bbclass
+++ b/classes/kernel-imximage.bbclass
@@ -22,39 +22,39 @@ DEPENDS:append = " u-boot-mkimage-native"
 IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}"
 
 imx_mkimage() {
-        uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
+    uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
 }
 
 gen_imximage() {
-        if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
-                bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
-        fi
+    if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
+        bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
+    fi
 
-        for DTB in ${KERNEL_DEVICETREE}; do
-                DTB=`normalize_dtb "${DTB}"`
-                DTB_EXT=${DTB##*.}
-                DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-                base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
-                symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
-                DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                for DCD in dcd-${DTB}.cfg dcd.cfg; do
-                        if [ -e "${WORKDIR}/${DCD}" ]; then
-                                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
-                                        ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
-                                fi
+    for DTB in ${KERNEL_DEVICETREE}; do
+        DTB=`normalize_dtb "${DTB}"`
+        DTB_EXT=${DTB##*.}
+        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+        base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
+        symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
+        DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        for DCD in dcd-${DTB}.cfg dcd.cfg; do
+            if [ -e "${WORKDIR}/${DCD}" ]; then
+                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
+                    ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
+                fi
 
-                                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
-                                        ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
-                                           ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
-                                fi
-                        fi
-                done
-        done
+                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
+                    ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
+                       ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
+                fi
+            fi
+        done
+    done
 }
 
 do_deploy:append() {
-        gen_imximage
+    gen_imximage
 }
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 e1f28c53b..e5dd268da 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
@@ -14,7 +14,7 @@ PV = "1.0+git${SRCPV}"
 do_configure[noexec] = "1"
 
 do_compile () {
-        oe_runmake
+    oe_runmake
 }
 
 do_install () {
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 1f63cd7a0..5a0bb5644 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -9,11 +9,11 @@ python __anonymous () {
 }
 
 SRC_URI:append:imxgpu2d = " \
-        file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
-        file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
-        file://0003-i.MX6-force-egl-visual-ID-33.patch \
-        file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \
-        file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \
+    file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
+    file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
+    file://0003-i.MX6-force-egl-visual-ID-33.patch \
+    file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \
+    file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \
 "
 
 DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
index f019c72da..e01bcf525 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
@@ -1,9 +1,9 @@
 # Fixes QT5 application builds searching for libimx6vivantevideonode.so
 # via cmake cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 do_install:append:imxgpu() {
-        install -d ${D}${libdir}/plugins/videoimx6vivantevideonode
-        ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so
-        ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so
+    install -d ${D}${libdir}/plugins/videoimx6vivantevideonode
+    ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so
+    ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so
 }
 
 INSANE_SKIP:${PN}-plugins:imxgpu = "dev-so"
diff --git a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
index 7cb6c07a3..981a57f46 100644
--- a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
+++ b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
@@ -4,6 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:qoriq-ppc = " file://qemu.conf"
 
 do_install:append:qoriq-ppc() {
-        install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
+    install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
 }
 
diff --git a/recipes-bsp/atf/qoriq-atf_2.12.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index f523fe352..d26a70374 100644
--- a/recipes-bsp/atf/qoriq-atf_2.12.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -123,7 +123,7 @@ do_compile() {
             ;;
         esac
 
-        if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then
+    if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then
             make V=1 realclean
             if [ -f rot_key.pem ];then
                 mkdir -p build/${PLATFORM}/release/
diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb
index 6b53e228f..39c18d6bd 100644
--- a/recipes-bsp/boot-format/boot-format_git.bb
+++ b/recipes-bsp/boot-format/boot-format_git.bb
@@ -10,7 +10,7 @@ SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550"
 EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"'
 
 do_install(){
-        oe_runmake DESTDIR=${D} PREFIX=${prefix} install
+    oe_runmake DESTDIR=${D} PREFIX=${prefix} install
 }
 
 PACKAGES =+ "${PN}-config"
diff --git a/recipes-bsp/imx-atf/imx-atf_2.12.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index 84f29975c..3852c5bd5 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.12.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
 PV .= "+git${SRCPV}"
 
 SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
-           file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
+       file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
 "
 ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.12"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
index 7ca89431a..67dd9ba3f 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
@@ -20,7 +20,7 @@ EXTRA_OEMAKE = "PLAT=${PLAT} OPENSSL_PATH=${STAGING_INCDIR} MBEDTLS_PATH=${STAGI
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install() {
-        oe_runmake -C ${S} DESTDIR=${D} install_tests
+    oe_runmake -C ${S} DESTDIR=${D} install_tests
 }
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index c1a39d647..4e028c606 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -20,20 +20,20 @@ MC_FLAVOUR ?= "${@oe.utils.ifelse(d.getVar('MACHINE').endswith('qds'), 'QDS', 'R
 MC_FOLDER ?= "${@d.getVar('MC_CFG').upper() + '-' + d.getVar('MC_FLAVOUR')}"
 
 do_compile () {
-        oe_runmake -C config
+    oe_runmake -C config
 }
 
 do_install () {
-        install -d ${D}/boot/mc-utils
-        if [ -e ${S}/config/${MC_CFG}/${MC_FOLDER} ]; then
-                cp -r ${S}/config/${MC_CFG}/${MC_FOLDER}/* ${D}/boot/mc-utils/
-        fi
-        find ${D}/boot/mc-utils/ ! -name "*.dtb" ! -type d -exec rm {} \;
+    install -d ${D}/boot/mc-utils
+    if [ -e ${S}/config/${MC_CFG}/${MC_FOLDER} ]; then
+        cp -r ${S}/config/${MC_CFG}/${MC_FOLDER}/* ${D}/boot/mc-utils/
+    fi
+    find ${D}/boot/mc-utils/ ! -name "*.dtb" ! -type d -exec rm {} \;
 }
 
 do_deploy () {
-        install -d ${DEPLOYDIR}/mc-utils
-        cp -r ${D}/boot/mc-utils/* ${DEPLOYDIR}/mc-utils/
+    install -d ${DEPLOYDIR}/mc-utils
+    cp -r ${D}/boot/mc-utils/* ${DEPLOYDIR}/mc-utils/
 }
 addtask deploy after do_install
 
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index ade3570c4..9e65e861a 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -16,9 +16,9 @@ PV = "0.0.0+git${SRCPV}"
 inherit pkgconfig
 
 do_compile() {
-        oe_runmake
+    oe_runmake
 }
 do_install() {
-        oe_runmake install DESTDIR="${D}"
+    oe_runmake install DESTDIR="${D}"
 }
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
index e6dfe4309..439c831f0 100644
--- a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
+++ b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
@@ -59,20 +59,20 @@ CVE_PRODUCT = "mbed_tls"
 
 # Strip host paths from autogenerated test files
 do_compile:append() {
-        sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
-        sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
+    sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
+    sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
 }
 
 # Export source files/headers needed by Arm Trusted Firmware
 sysroot_stage_all:append() {
-        sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
-        sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
+    sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
+    sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
 }
 
 do_install_ptest () {
-        install -d ${D}${PTEST_PATH}/tests
-        install -d ${D}${PTEST_PATH}/framework
-        cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
-        find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
-        cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/
+    install -d ${D}${PTEST_PATH}/tests
+    install -d ${D}${PTEST_PATH}/framework
+    cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
+    find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
+    cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/
 }
diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
index c14fd955b..d5814a4f6 100644
--- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
+++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;br
 PV = "1.0+${SRCPV}"
 
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 
 inherit pkgconfig
diff --git a/recipes-devtools/qemu/qemu-qoriq.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index 6c3b3d70b..9e1165eaf 100644
--- a/recipes-devtools/qemu/qemu-qoriq.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
@@ -37,9 +37,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://CVE-2020-25624.patch \
            file://CVE-2020-25723.patch \
            file://CVE-2020-28916.patch \
-           file://CVE-2020-35517.patch \
-           file://CVE-2020-29443.patch \
-           file://CVE-2021-20203.patch \
+       file://CVE-2020-35517.patch \
+       file://CVE-2020-29443.patch \
+       file://CVE-2021-20203.patch \
            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
@@ -58,17 +58,17 @@ do_install:append() {
 }
 
 do_compile_ptest() {
-        make buildtest-TESTS
+    make buildtest-TESTS
 }
 
 do_install_ptest() {
-        cp -rL ${B}/tests ${D}${PTEST_PATH}
-        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
+    cp -rL ${B}/tests ${D}${PTEST_PATH}
+    find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
 
-        cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
-        # Don't check the file genreated by configure
-        sed -i -e '/wildcard config-host.mak/d' \
-               -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
+    cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
+    # Don't check the file genreated by configure
+    sed -i -e '/wildcard config-host.mak/d' \
+           -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
         sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
             ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env
 }
@@ -104,11 +104,11 @@ B = "${WORKDIR}/build"
 EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
 
 do_configure:prepend:class-native() {
-        # Append build host pkg-config paths for native target since the host may provide sdl
-        BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
-        if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
-                export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
-        fi
+    # Append build host pkg-config paths for native target since the host may provide sdl
+    BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+    if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+        export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+    fi
 }
 
 do_configure() {
@@ -117,8 +117,8 @@ do_configure() {
 do_configure[cleandirs] += "${B}"
 
 do_install () {
-        export STRIP=""
-        oe_runmake 'DESTDIR=${D}' install
+    export STRIP=""
+    oe_runmake 'DESTDIR=${D}' install
 }
 
 # The following fragment will create a wrapper for qemu-mips user emulation
@@ -128,10 +128,10 @@ do_install () {
 # the qemu-mips works fine.
 # IMPORTANT: This piece needs to be removed once the root cause is fixed!
 do_install:append() {
-        if [ -e "${D}/${bindir}/qemu-mips" ]; then
-                create_wrapper ${D}/${bindir}/qemu-mips \
-                        QEMU_RESERVED_VA=0x0
-        fi
+    if [ -e "${D}/${bindir}/qemu-mips" ]; then
+        create_wrapper ${D}/${bindir}/qemu-mips \
+            QEMU_RESERVED_VA=0x0
+    fi
 }
 # END of qemu-mips workaround
 
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 2276ac3c6..df4da0358 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
 SRCREV = "7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
 
 CFLAGS += "-fmacro-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1 \
-                -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
+        -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
 
 EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
         CROSS_COMPILE=${TARGET_PREFIX} KERNEL_SRC=${STAGING_KERNEL_DIR}"
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
index 485f763bf..225c4e3c9 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
@@ -23,8 +23,8 @@ do_configure:prepend() {
 }
 
 do_install() {
-        install -d ${D}${bindir}/
-        install -m 0755 app/pktgen ${D}${bindir}/
+    install -d ${D}${bindir}/
+    install -m 0755 app/pktgen ${D}${bindir}/
         install -m 0644 ${S}/Pktgen.lua ${D}${bindir}/
 }
 
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 66ca551ec..4b28d2614 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -24,12 +24,12 @@ do_compile() {
         for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
             cd  ${APP}
             oe_runmake
-            cd ..
+        cd ..
         done
 }
 
 do_install() {
-        install -d ${D}${bindir}
+    install -d ${D}${bindir}
         install -d ${D}${includedir}
         install -d ${D}${base_libdir}/optee_armtz
         install -d ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 72638766c..ef0bfcd55 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -18,11 +18,11 @@ export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`"
 export LIBEDIT_LDFLAGS = "`pkg-config --libs --static libedit`"
 
 do_compile () {
-        oe_runmake
+    oe_runmake
 }
 
 do_install () {
-        oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D}
 }
 
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)"
diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb
index c046548e5..19072f70b 100644
--- a/recipes-extended/tsntool/tsntool_git.bb
+++ b/recipes-extended/tsntool/tsntool_git.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/nxp-qoriq/tsntool;protocol=https;nobranch=1"
 SRCREV = "a0769e23304957a22f0cbeee6d1f547b20c3c21e"
 
 SRC_URI:append = " \
-        file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
+    file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
 "
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
index f14c077fd..12c0aa3eb 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
@@ -9,39 +9,39 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 NETWORK_TOOLS = "\
-        ethtool \
+    ethtool \
 "
 
 NETWORK_TOOLS:append:qoriq = " \
-        ceetm \
-        dpdk \
-        ovs-dpdk \
-        pktgen-dpdk \
-        tsntool \
+    ceetm \
+    dpdk \
+    ovs-dpdk \
+    pktgen-dpdk \
+    tsntool \
 "
 
 # Data Place Acceleration Architecture
 NETWORK_TOOLS:append:fsl-lsch2 = " \
-        eth-config \
+    eth-config \
 "
 
 # 2nd generation Data Place Acceleration Architecture
 NETWORK_TOOLS:append:ls1088a = " \
-        aiopsl \
-        gpp-aioptool \
-        ofp \
+    aiopsl \
+    gpp-aioptool \
+    ofp \
 "
 
 NETWORK_TOOLS:append:ls2088a = " \
-        aiopsl \
-        gpp-aioptool \
-        ofp \
+    aiopsl \
+    gpp-aioptool \
+    ofp \
 "
 
 NETWORK_TOOLS:append:fsl-lsch3 = " \
-        dce \
-        restool \
-        spc \
+    dce \
+    restool \
+    spc \
 "
 
 RDEPENDS:${PN} = "\
diff --git a/recipes-graphics/drm/libdrm_2.4.127.imx.bb b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
index 198db014e..1d3c208ce 100644
--- a/recipes-graphics/drm/libdrm_2.4.127.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://dri.freedesktop.org"
 SECTION = "x11/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb1f4831351ab42d762c40b3ebb7add \
-                    file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
+            file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
 PROVIDES = "drm"
 DEPENDS = "libpthread-stubs"
 
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 6cedf2525..7aa1c59bf 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -77,23 +77,23 @@ PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
 PACKAGES =+ "\
-        libgles1-imx libgles1-imx-dev \
-        libgles2-imx libgles2-imx-dev \
-        libgles3-imx-dev \
-        libglslc-imx libglslc-imx-dev \
-        ${PACKAGES_OPENCL} \
-        libopenvg-imx libopenvg-imx-dev \
-        libvdk-imx libvdk-imx-dev \
-        libegl-imx libegl-imx-dev \
-        libgal-imx libgal-imx-dev \
-        libvsc-imx \
-        ${PACKAGES_GBM} \
-        imx-gpu-viv-tools \
-        imx-gpu-viv-demos \
-        ${PACKAGES_VULKAN} \
-        ${PACKAGES_OPENVX} \
-        libnn-imx \
-        libspirv-imx \
+    libgles1-imx libgles1-imx-dev \
+    libgles2-imx libgles2-imx-dev \
+    libgles3-imx-dev \
+    libglslc-imx libglslc-imx-dev \
+    ${PACKAGES_OPENCL} \
+    libopenvg-imx libopenvg-imx-dev \
+    libvdk-imx libvdk-imx-dev \
+    libegl-imx libegl-imx-dev \
+    libgal-imx libgal-imx-dev \
+    libvsc-imx \
+    ${PACKAGES_GBM} \
+    imx-gpu-viv-tools \
+    imx-gpu-viv-demos \
+    ${PACKAGES_VULKAN} \
+    ${PACKAGES_OPENVX} \
+    libnn-imx \
+    libspirv-imx \
 "
 
 PACKAGES_GBM                  = ""
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 151a8ed34..5ee2775c7 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -103,29 +103,29 @@ PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
 PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
 
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    # Weston doesn't need the .la files to load modules, so wipe them
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
 
-        # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+    # If X11, ship a desktop file to launch it
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+        install -d ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
 
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+        chmod u+s ${D}${bindir}/weston-launch
+    fi
 }
 
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index 2c0b13d41..811e63c26 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -103,29 +103,29 @@ PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipe
 PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam"
 
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    # Weston doesn't need the .la files to load modules, so wipe them
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
 
-        # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+    # If X11, ship a desktop file to launch it
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+        install -d ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
 
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+    fi
 
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
-        fi
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+        chmod u+s ${D}${bindir}/weston-launch
+    fi
 }
 
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index e1065b8e8..eb0fdfa5c 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -17,10 +17,10 @@ do_compile:prepend() {
 }
 
 do_install(){
-        install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
-        install -d ${D}${bindir}
-        install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
-        cp -f ${S}/bin/ar_* ${D}${bindir}/
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
+    install -d ${D}${bindir}
+    install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
+    cp -f ${S}/bin/ar_* ${D}${bindir}/
 }
 
 FILES:${PN} += "${bindir}/"
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
index 78e864382..dfbe70838 100644
--- a/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
@@ -29,7 +29,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 do_install:append() {
-        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
+    install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
 }
 
 RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
index 68918414c..0fac7771f 100644
--- a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -18,7 +18,7 @@ do_install() {
 }
 
 do_deploy() {
-        echo "Do not inherit do_deploy from optee-os."
+    echo "Do not inherit do_deploy from optee-os."
 }
 
 FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
index 491817ef1..93a049001 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
@@ -18,7 +18,7 @@ do_install() {
 }
 
 do_deploy() {
-        echo "Do not inherit do_deploy from optee-os."
+    echo "Do not inherit do_deploy from optee-os."
 }
 
 FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
index 3241ab8c4..64c666286 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
@@ -4,18 +4,18 @@ OPTEE_OS_BRANCH = "lf-6.12.49_2.2.0"
 SRCREV = "b3883a773a9d15ec6439f9229e48f540c37e0d00"
 
 do_install:append () {
-        install -d ${D}${nonarch_base_libdir}/firmware/
-        install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
-        install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
+    install -d ${D}${nonarch_base_libdir}/firmware/
+    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
+    install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
 
-        # Install embedded TAs
-        install -d ${D}${base_libdir}/optee_armtz/
-        install -m 444 ${B}/ta/*/*.ta ${D}${base_libdir}/optee_armtz/
+    # Install embedded TAs
+    install -d ${D}${base_libdir}/optee_armtz/
+    install -m 444 ${B}/ta/*/*.ta ${D}${base_libdir}/optee_armtz/
 }
 
 do_deploy:append () {
-        install -d ${DEPLOYDIR}/optee
-        install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
+    install -d ${DEPLOYDIR}/optee
+    install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
 }
 
 FILES:${PN} = "${nonarch_base_libdir}/optee_armtz/ ${nonarch_base_libdir}/firmware/"
diff --git a/recipes-security/smw/crypto-af-alg_git.bb b/recipes-security/smw/crypto-af-alg_git.bb
index 4101776a5..22e982b96 100644
--- a/recipes-security/smw/crypto-af-alg_git.bb
+++ b/recipes-security/smw/crypto-af-alg_git.bb
@@ -15,7 +15,7 @@ SRCREV = "2fb11a600af90c80b8bb23368d1d6831c5deb973"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 869fbb4a8..ba32c9ca2 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -18,7 +18,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 EXTRA_OEMAKE = "OPENSSL_PATH=${STAGING_INCDIR}"
 
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp|qoriq)"