From 025b64f23ecbbb825a6705684de2555da633fd7d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 7 Nov 2021 12:50:14 -0600 Subject: wayland: Fix wayland-tools packaging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 35d54049a94897626eafcd4922ca7ef25a76859c) Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie (cherry picked from commit a31fbec45d24df5b74091940d0e0b2daf34d8492) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/wayland_1.19.0.bb | 6 +++--- 1 file 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 () { cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ } -PACKAGES += "${PN}-tools" +PACKAGES =+ "${PN}-tools" -FILES:${PN} = "${libdir}/*${SOLIBS}" -FILES:${PN}-tools += "${bindir} ${datadir}/wayland" +FILES:${PN}-tools = "${bindir}/wayland-scanner" +FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf