[PATCH 1/3] wayland: Fix wayland-tools packaging problems

[PATCH 1/3] wayland: Fix wayland-tools packaging problems

[Tom Hochstein]

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 <tom.hochstein@nxp.com>
---
 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

[PATCH 2/3] nativesdk-packagegroup-sdk-host.bb: Update host tools for wayland

[Tom Hochstein]

The wayland-scanner host tool required to build weston is moved to the
wayland-tools package, so update the SDK host tools list accordingly.

Also, the weston build requires wayland-scanner.pc to find wayland-scanner,
so add wayland-tools-dev.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 .../packagegroups/nativesdk-packagegroup-sdk-host.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 39e5002bb7..16752026d0 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,7 +25,7 @@ RDEPENDS:${PN} = "\
     nativesdk-makedevs \
     nativesdk-cmake \
     nativesdk-meson \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland-tools nativesdk-wayland-tools-dev', '', d)} \
     nativesdk-sdk-provides-dummy \
     nativesdk-bison \
     nativesdk-flex \
-- 
2.17.1

[PATCH 3/3] bitbake.conf: Use wayland distro feature for native builds

[Tom Hochstein]

The wayland-scanner is missing from SDKs with weston, but the weston build
requires wayland-scanner. Allow the distro feature in order to include
the wayland-scanner packages via nativesdk-packagegroup-sdk-host.bb.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 790f2f7a8c..71c1e52ad6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -869,8 +869,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
-- 
2.17.1

Re: [OE-core] [PATCH 1/3] wayland: Fix wayland-tools packaging problems

[Richard Purdie]

On Sun, 2021-11-07 at 10:00 -0600, Tom Hochstein wrote:
> 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 <tom.hochstein@nxp.com>
> ---
>  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"
> 

Shouldn't these just go into wayland-dev?

Cheers,

Richard