imx-base: Move the i.MX SDK host tools to TOOLCHAIN_HOST_TASK

A bbappend to nativesdk-packagegroup-sdk-host added
nativesdk-imx-usb-loader, nativesdk-mxsldr, nativesdk-u-boot-mkimage and
nativesdk-wayland to RDEPENDS unconditionally, so an SDK built for any
machine in a build with meta-freescale in BBLAYERS picked up i.MX
flashing tools. Measured on qemuarm64 with bitbake -e: RDEPENDS gained
exactly those four.

The obvious fix -- scoping that RDEPENDS to a machine override -- would
be worse than the leak. That packagegroup has a fixed PACKAGE_ARCH of
${SDK_ARCH}-nativesdk, so making its contents depend on MACHINE would
emit different package content under one package architecture, and two
SDKs built from the same TMPDIR would overwrite each other in the feed.
oe-core's own recipe is careful here: it varies only by SDK_ARCH and
DISTRO_FEATURES, never by MACHINE.

Drop the bbappend and add the tools to TOOLCHAIN_HOST_TASK in
imx-base.inc instead. populate_sdk_base consumes that variable in the
SDK recipe, which is already machine-specific, so there is no
package-architecture hazard. imx-base.inc is required only by i.MX
machine configurations -- 27 of them, no QorIQ -- and the append is
additionally scoped to imx-generic-bsp to match the IMAGE_CLASSES line
above it.

Measured with bitbake -e, before vs after:

  qemuarm64        TOOLCHAIN_HOST_TASK gains none of the four tools
  imx6qdlsabresd   TOOLCHAIN_HOST_TASK gains exactly the four tools;
                   nothing else in the expansion moves

Note for QorIQ: those machines previously received these tools through
the unconditional bbappend and no longer do. Three of the four are
i.MX-specific, so this is intended, but it is a behaviour change for
machines this layer does own.

bitbake -p: 1166 recipes, 0 errors. No SDK was built, so the effect on a
populated SDK is inferred from TOOLCHAIN_HOST_TASK, not measured.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
(cherry picked from commit c42a38609d6bebf15643e3a04acfe42bd8aac117)

1 files changed, 12 insertions, 0 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 21cc4ea52..8030d69f9 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -698,6 +698,18 @@ HOSTTOOLS_NONFATAL:append:mx8-nxp-bsp = " sha384sum"
 # Add task to generate the mfgtool bundle for the image.
 IMAGE_CLASSES:append:imx-generic-bsp = " image_populate_mfgtool"
 
+# i.MX host tools for the SDK. Deliberately not a bbappend to
+# nativesdk-packagegroup-sdk-host: that packagegroup has a fixed PACKAGE_ARCH
+# (${SDK_ARCH}-nativesdk), so varying its RDEPENDS by MACHINE would emit
+# different content under one package architecture. TOOLCHAIN_HOST_TASK is
+# consumed by the SDK recipe, which is already machine-specific.
+TOOLCHAIN_HOST_TASK:append:imx-generic-bsp = " \
+    nativesdk-imx-usb-loader \
+    nativesdk-mxsldr \
+    nativesdk-u-boot-mkimage \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
+"
+
 SECO_FIRMWARE_NAME:mx943-generic-bsp ?= "mx943${IMX_SOC_REV_LOWER}-ahab-container.img"
 
 # Allow meta-imx to add NIP devices information until upstreamed.