[PATCH 1/2] bitbake.conf: Fix nativesdk-wayland missing from SDK

[PATCH 1/2] bitbake.conf: Fix nativesdk-wayland missing from SDK

[Tom Hochstein]

nativesdk-wayland was not being added to the SDK because it
relies on checking the distro feature. This fixes that by
filtering the wayland feature to the SDK build.

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

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4b544a22cd..e44de34a00 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -830,7 +830,7 @@ 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"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation wayland"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
-- 
2.17.1

[PATCH 2/2] wayland: Fix wayland-scanner missing from SDK

[Tom Hochstein]

The FILES variable is customized to package wayland-scanner
in the target -dev package. However, this is not correct for
the nativesdk packages and causes wayland-scanner to be
missing from the SDK.

Fix the nativesdk packaging by properly limiting the
wayland-scanner target packaging.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 meta/recipes-graphics/wayland/wayland_1.18.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
index 00be3aac27..c7098483bc 100644
--- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -54,8 +54,8 @@ sysroot_stage_all_append_class-target () {
 	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
 }
 
-FILES_${PN} = "${libdir}/*${SOLIBS}"
-FILES_${PN}-dev += "${bindir} ${datadir}/wayland"
+FILES_${PN}_class-target = "${libdir}/*${SOLIBS}"
+FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.17.1

Re: [PATCH 2/2] wayland: Fix wayland-scanner missing from SDK

[Richard Purdie]

On Thu, 2020-03-19 at 13:34 -0500, Tom Hochstein wrote:
> The FILES variable is customized to package wayland-scanner
> in the target -dev package. However, this is not correct for
> the nativesdk packages and causes wayland-scanner to be
> missing from the SDK.
> 
> Fix the nativesdk packaging by properly limiting the
> wayland-scanner target packaging.
> 
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
>  meta/recipes-graphics/wayland/wayland_1.18.0.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> index 00be3aac27..c7098483bc 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> @@ -54,8 +54,8 @@ sysroot_stage_all_append_class-target () {
>  	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
>  }
>  
> -FILES_${PN} = "${libdir}/*${SOLIBS}"
> -FILES_${PN}-dev += "${bindir} ${datadir}/wayland"
> +FILES_${PN}_class-target = "${libdir}/*${SOLIBS}"
> +FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"

Nobody can look at that and tell that its an fix for nativesdk
packaging. At the very least it needs a comment about what its doing
but I can't help feeling there must be some neater way we can do this
that overrides for nativesdk instead of misleading with target
references?

Cheers,

Richard

[PATCH 2/2] wayland: Fix wayland-scanner missing from SDK

[Tom Hochstein]

The FILES variable is customized to package wayland-scanner
in the target -dev package. However, this is not correct for
the nativesdk packages and causes wayland-scanner to be
missing from the SDK.

Fix the nativesdk packaging by properly limiting the
wayland-scanner target packaging.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 meta/recipes-graphics/wayland/wayland_1.17.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.17.0.bb
index 12916a0c40..cb4ff2c20b 100644
--- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.17.0.bb
@@ -43,7 +43,7 @@ sysroot_stage_all_append_class-target () {
 	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
 }
 
-FILES_${PN} = "${libdir}/*${SOLIBS}"
-FILES_${PN}-dev += "${bindir} ${datadir}/wayland"
+FILES_${PN}_class-target = "${libdir}/*${SOLIBS}"
+FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1