weston-init: Scope the i.MX PACKAGECONFIG and do_install to i.MX

Both statements were unscoped, so they applied to every machine in any
build with meta-freescale in BBLAYERS, not just the ones this layer
owns. oelint.vars.noncoreoverride flagged both.

PACKAGECONFIG used a plain '??=', which re-defaulted oe-core's
weston-init on every machine and added 'no-idle-timeout' to all of them.
The four helper variables it interpolates already expand empty
off-target, so 'no-idle-timeout' was the whole of the leak.

do_install:append() was worse: it ran everywhere and roughly doubled
oe-core's do_install. Every branch in it is driven by an i.MX
PACKAGECONFIG (gbm-format, use-g2d, repaint-window, size) or by the i.MX
weston.config, so none of it has anything to do off-target.

Scope both to imx-generic-bsp, which covers every i.MX machine on both
the NXP and mainline BSP paths.

Measured with bitbake -e, meta-freescale in and out of BBLAYERS:

  qemuarm64, before: PACKAGECONFIG "xwayland" -> "no-idle-timeout
                     xwayland"; do_install 4201 -> 8383 chars
  qemuarm64, after:  PACKAGECONFIG "xwayland"; do_install 4201 chars,
                     byte-identical to the oe-core-only expansion
  imx6qdlsabresd:    PACKAGECONFIG, do_install, DEPENDS and SRC_URI all
                     unchanged before vs after this commit

Note for QorIQ: those machines previously picked up 'no-idle-timeout'
and the do_install body through the unscoped form and no longer do. That
is intentional -- the block is i.MX-specific throughout -- but it is a
behaviour change for machines this layer does own.

bitbake -p: 1166 recipes, 0 errors. No build was run, so this is
parse/expand-tier evidence only.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>

1 files changed, 7 insertions, 2 deletions

diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index fddc4e651..680b725f9 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -19,7 +19,9 @@ REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 
 SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config"
 
-PACKAGECONFIG ??= "\
+# Scoped to imx-generic-bsp: unscoped this re-defaulted oe-core's PACKAGECONFIG
+# on every machine, adding 'no-idle-timeout' to ones this layer does not own.
+PACKAGECONFIG:imx-generic-bsp ??= "\
     no-idle-timeout \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
     ${PACKAGECONFIG_GBM_FORMAT} \
@@ -96,7 +98,10 @@ insert_line_after() {
 }
 insert_line_after[doc] = "Insert line (arg2) after lines matching pattern (arg1) in file (arg3)"
 
-do_install:append() {
+# Scoped to imx-generic-bsp: unscoped this ran everywhere and roughly doubled
+# oe-core's do_install. Every branch is driven by an i.MX PACKAGECONFIG or by
+# the i.MX weston.config.
+do_install:append:imx-generic-bsp() {
     # Replace the template variables
     sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini