diff options
| author | Luciano Dittgen <luciano.dittgen@ossystems.com.br> | 2026-08-06 15:05:33 -0300 |
|---|---|---|
| committer | Luciano Dittgen <luciano.dittgen@ossystems.com.br> | 2026-08-07 09:30:01 -0300 |
| commit | 8271ea0c506a30ceb431ef4b6f854062b3266a85 (patch) | |
| tree | 3157f540eaf459edd8b71031d2d2a34b4d554a1a /dynamic-layers/ivi | |
| parent | d09e696d588c6db1a2dc5ae9b110b68e6b6b4e12 (diff) | |
| download | meta-freescale-8271ea0c506a30ceb431ef4b6f854062b3266a85.tar.gz | |
weston-init: Stop the IVI weston.ini replacing oe-core's everywhere
The IVI bbappend is a single FILESEXTRAPATHS:prepend line, and the
directory it adds holds a top-level weston.ini. oe-core's weston-init.bb
fetches "file://weston.ini" unconditionally, so prepending that path for
every machine made NXP's IVI configuration -- shell=ivi-shell.so,
hmi-controller.so and ten [ivi-launcher] blocks -- silently replace
oe-core's weston.ini on every machine in any build that also has
meta-ivi, i.MX or not.
Scope the prepend to imx-generic-bsp. The layer already does this where
a file would otherwise be picked up too widely: waffle uses
FILESEXTRAPATHS:prepend:imxgpu and pulseaudio uses
FILESEXTRAPATHS:prepend:imx-nxp-bsp.
This is the one FILESEXTRAPATHS line in the layer that needed scoping.
The other eighteen are safe unscoped precisely because their directories
contain no top-level file that the upstream recipe also fetches --
checked, rather than assumed, across all of them.
NOT VALIDATED: meta-ivi is not checked out in this workspace, so this
bbappend is not parsed here and the change could not be measured the way
the other fixes in this series were. The reasoning is structural -- the
file listing, oe-core's SRC_URI, and a diff of the two weston.ini files
-- and it needs confirming in a tree that has meta-ivi.
Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
Diffstat (limited to 'dynamic-layers/ivi')
| -rw-r--r-- | dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend index 4fc41d058..87b9dbdfd 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend | |||
| @@ -1 +1,5 @@ | |||
| 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | 1 | # Scoped, unlike the layer's other FILESEXTRAPATHS lines, because this |
| 2 | # directory holds a top-level weston.ini and oe-core's weston-init.bb fetches | ||
| 3 | # "file://weston.ini" unconditionally -- unscoped, the NXP IVI config replaced | ||
| 4 | # oe-core's on every machine in any build that also has meta-ivi. | ||
| 5 | FILESEXTRAPATHS:prepend:imx-generic-bsp := "${THISDIR}/${PN}:" | ||