Merge pull request #2645 from lucianogdittgen/oelint-vars-inconspaces

Clear all oelint.vars.inconspaces findings

11 files changed, 32 insertions, 9 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
index e3f405fca..a3078c369 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
@@ -148,7 +148,7 @@ export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/"
 
 TARGET_CC_ARCH += "-I${S}/include "
 
-PACKAGES += " \
+PACKAGES += "\
     ${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \
@@ -311,6 +311,9 @@ SRC_URI += "\
     git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=4.x;protocol=https \
     file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=${UNPACKDIR}/extra \
 "
+# SRCREV_FORMAT is an underscore-joined list of SRC_URI names; the appended
+# component must attach directly with no leading space.
+# nooelint: oelint.vars.inconspaces
 SRCREV_FORMAT:append = "_extra"
 SRCREV_extra = "b6db059e9b80072d80d009d2ab344f8606a8e964"
 
diff --git a/recipes-bsp/atf/qoriq-atf-tools_2.12.bb b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
index 2c1db306c..fc67fae6a 100644
--- a/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
+++ b/recipes-bsp/atf/qoriq-atf-tools_2.12.bb
@@ -2,6 +2,9 @@ require qoriq-atf-${PV}.inc
 
 DEPENDS += "openssl"
 
+# PV is a version string; the appended part concatenates with a leading '+'
+# and must not contain a space.
+# nooelint: oelint.vars.inconspaces
 PV:append = "+${SRCPV}"
 
 EXTRA_OEMAKE = "fiptool V=1 PLAT=lx2162aqds HOSTCC='${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}'"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 3f14a79df..0d96e1cc4 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -45,7 +45,12 @@ SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
+# ATF_MACHINE_NAME is a filename used as ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME}.
+# The appended tokens are hyphen-joined name suffixes and must not start with a
+# space, or the resulting path would contain a space and the copy would fail.
+# nooelint: oelint.vars.inconspaces
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '-crrm', '', d)}"
+# nooelint: oelint.vars.inconspaces
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
 BOOT_VARIANT ?= ""
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 7ff408000..970db74c0 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
@@ -33,7 +33,7 @@ OECMAKE_SOURCEPATH = "${S}/appshell"
 OECMAKE_GENERATOR = "Unix Makefiles"
 
 # Workaround for linking issues seen with gold linker
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}"
 
 SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
 
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 001ebaa45..f9dc13b9d 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -21,7 +21,11 @@ DEPENDS:append:qoriq-ppc = " boot-format-native"
 
 PROVIDES += "u-boot"
 
+# PV is a version string; the appended parts concatenate with a leading '+'
+# and must not contain a space.
+# nooelint: oelint.vars.inconspaces
 PV:append = "+${SRCPV}"
+# nooelint: oelint.vars.inconspaces
 PV:append = "+fslgit"
 
 UBOOT_BRANCH ?= "lf_v2025.04"
diff --git a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
index 87c89d4ec..295600993 100644
--- a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
+++ b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
@@ -43,7 +43,7 @@ PACKAGECONFIG[psa] = ""
 PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF"
 
 # For now the only way to enable PSA is to explicitly pass a -D via CFLAGS
-CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}"
+CFLAGS:append = " ${@bb.utils.contains('PACKAGECONFIG', 'psa', '-DMBEDTLS_USE_PSA_CRYPTO', '', d)}"
 
 PACKAGES =+ "${PN}-programs"
 FILES:${PN}-programs += "${bindir}/"
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index c3f48699e..19ff38980 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -27,7 +27,7 @@ python() {
 RDEPENDS:${PN}:class-target += "bash"
 
 EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
+EXTRA_OECONF:append:class-target:mipsarcho32 = " ${@bb.utils.contains('BBEXTENDCURR', 'multilib', '--disable-capstone', '', d)}"
 
 do_install_ptest() {
         cp -rL ${B}/tests ${D}${PTEST_PATH}
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 55a1fcbc7..e685a2417 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
@@ -51,10 +51,18 @@ WINDOW_SYSTEM = \
         bb.utils.contains('DISTRO_FEATURES',     'x11',         'X11', \
                                                                  'FB', d), d)}"
 
+# FEATURES is a comma-separated list passed to FslBuild.py as
+# --UseFeatures [${FEATURES}], so each appended token starts with a comma
+# and must NOT start with a space. A leading space would inject an invalid
+# feature name into the build.
 FEATURES = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
+# nooelint: oelint.vars.inconspaces
 FEATURES:append:imxgpu = ",HW_GPU_VIVANTE"
+# nooelint: oelint.vars.inconspaces
 FEATURES:append:imxgpu2d = ",G2D"
+# nooelint: oelint.vars.inconspaces
 FEATURES:append:imxgpu3d = ",OpenGLES2"
+# nooelint: oelint.vars.inconspaces
 FEATURES:append = "${FEATURES_SOC}"
 
 FEATURES_SOC = ""
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index a0aa566b6..ca3922478 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -131,8 +131,8 @@ do_install:append() {
     fi
 }
 
-PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
-             libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
+PACKAGES += "libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}"
 
 FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
 # Main package is curated to weston's own binaries, config and plugins; the
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index b00c8d225..a3303a81f 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -131,8 +131,8 @@ do_install:append() {
     fi
 }
 
-PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
-             libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
+PACKAGES += "libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}"
 
 FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
 # Main package is curated to weston's own binaries, config and plugins; the
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index c10ce213d..3f524fb06 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -41,7 +41,7 @@ EXTRA_OEMAKE += "HOST_PREFIX=${HOST_PREFIX}"
 EXTRA_OEMAKE += "CROSS_COMPILE64=${HOST_PREFIX}"
 
 # Enable BTI in optee
-EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
+EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', 'CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
 
 LDFLAGS[unexport] = "1"
 CPPFLAGS[unexport] = "1"