There are several 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-scanner.pc and wayland-scanner.m4 are incorrectly
located in the main package. The files wayland.dtd and wayland.xml
are incorrectly located here but belong in the main package.
Fix the problems by moving wayland-tools before the other packages,
adding wayland-tools-dev, and dropping the main package FILES
variable override as no longer needed.
After the fix wayland-tools and wayland-tools-dev look like this:
wayland-tools
└── usr
└── bin
└── wayland-scanner
wayland-tools-dev
└── usr
├── lib
│ └── pkgconfig
│ └── wayland-scanner.pc
└── share
├── aclocal
│ └── wayland-scanner.m4
└── wayland
└── wayland-scanner.mk
Signed-off-by: Tom Hochstein <[email protected]>
---
meta/recipes-graphics/wayland/wayland_1.19.0.bb | 10 +++++++---
1 file changed, 7 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..74d6d65e9e 100644
--- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb
@@ -52,10 +52,14 @@ sysroot_stage_all:append:class-target () {
cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4
${SYSROOT_DESTDIR}/${datadir}/aclocal/
}
-PACKAGES += "${PN}-tools"
+PACKAGES =+ "${PN}-tools ${PN}-tools-dev"
-FILES:${PN} = "${libdir}/*${SOLIBS}"
-FILES:${PN}-tools += "${bindir} ${datadir}/wayland"
+FILES:${PN}-tools = "${bindir}/wayland-scanner"
+FILES:${PN}-tools-dev = " \
+ ${libdir}/pkgconfig/wayland-scanner.pc \
+ ${datadir}/aclocal/wayland-scanner.m4 \
+ ${datadir}/wayland/wayland-scanner.mk \
+"
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157954):
https://lists.openembedded.org/g/openembedded-core/message/157954
Mute This Topic: https://lists.openembedded.org/mt/86885053/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
