diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2026-01-06 16:20:47 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2026-01-07 10:09:01 +0100 |
| commit | 48dfc5f5f33ca45ebb313cf821c988885656ad12 (patch) | |
| tree | 13053166618e89513700e0baf20e5c15e34e7cb1 /conf/machine | |
| parent | 2dfa4420b4541a9ebd9b0f8db31512ed04ca188f (diff) | |
| download | meta-freescale-48dfc5f5f33ca45ebb313cf821c988885656ad12.tar.gz | |
wayland-protocols: use upstream repo with NXP downstream patches
OE-core update wayland-utils to 1.3.0 which now requires
wayland-protocols version >= 1.44.
As the imx-nxp-bsp forked wayland protocols and does not provide
a version later than 1.41 the build fails in do_configure of
wayland-utils.
Drop the wayland-protocol recipe of the downstream fork, extract
the 3 relevant patches on top of upstream v1.41 and apply them
in a bbappend on top of whatever OE-core provides for wayland-protocols.
(6 downstream patches not relevant for the build are dropped)
| ../sources/wayland-utils-1.3.0/wayland-info/meson.build:4:9:
| ERROR: Dependency lookup for wayland-protocols with method 'pkgconfig' failed:
| Invalid version, need 'wayland-protocols' ['>= 1.44'] found '1.41'.
The `inherit allarch` from OE-core can not easily be overridden. I.e.
just setting `PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"` was
ignored and the packages were still allarch without the workaround.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
wayland-protocol: drop patches 0004-0009
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/imx-base.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4e0b2f927..df3773d2e 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -588,8 +588,6 @@ PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" | |||
| 588 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" | 588 | PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" |
| 589 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 589 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
| 590 | 590 | ||
| 591 | PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.41.imx" | ||
| 592 | |||
| 593 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" | 591 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" |
| 594 | 592 | ||
| 595 | # Use i.MX libdrm Version | 593 | # Use i.MX libdrm Version |
