summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2021-11-07 12:50:14 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-08 22:03:51 +0000
commit166cbbbd48d6c91b70eb47c54fb224628df0432d (patch)
tree022d4433d9d8dfca56b3accdd4147bc0e2a6e6fd
parent28937721ab04968e689aec26a92a2317dd2d5828 (diff)
downloadpoky-166cbbbd48d6c91b70eb47c54fb224628df0432d.tar.gz
wayland: Fix wayland-tools packaging
There are some packaging problems due to the wayland-tools packaging implementation. The wayland-tools package currently looks like this: wayland-tools └── usr ├── bin │   └── wayland-scanner └── share └── wayland ├── wayland.dtd ├── wayland-scanner.mk └── wayland.xml The files wayland.dtd and wayland.xml belong in the main package, while wayland-scanner.mk belongs in wayland-dev. Fix the wayland.dtd and wayland.xml packaging by prepending the wayland-tools package and dropping the main package FILES variable override. The file wayland-scanner.mk is included in the main package by default, and so must be explicitly added to wayland-dev. (From OE-Core rev: a31fbec45d24df5b74091940d0e0b2daf34d8492) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.19.0.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
index d6e468497d..5f8b972f76 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
@@ -52,10 +52,10 @@ sysroot_stage_all:append:class-target () {
52 cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ 52 cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
53} 53}
54 54
55PACKAGES += "${PN}-tools" 55PACKAGES =+ "${PN}-tools"
56 56
57FILES:${PN} = "${libdir}/*${SOLIBS}" 57FILES:${PN}-tools = "${bindir}/wayland-scanner"
58FILES:${PN}-tools += "${bindir} ${datadir}/wayland" 58FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk"
59 59
60BBCLASSEXTEND = "native nativesdk" 60BBCLASSEXTEND = "native nativesdk"
61 61