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

Submitted by Tom Hochstein on March 21, 2020, 5:26 a.m. | Patch ID: 171195

Details

Message ID 20200321052650.24220-2-tom.hochstein@nxp.com
State New
Headers show

Commit Message

Tom Hochstein March 21, 2020, 5:26 a.m.
The FILES variable was customized to package wayland-scanner
in the -dev package. However, this is only correct for the
target package and causes wayland-scanner to be missing from
the SDK.

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

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

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
index 00be3aac27..4d110a6e1f 100644
--- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -54,8 +54,10 @@  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"
+# Place wayland-scanner in the -dev package for the target.
+# Leave it in the main package for native so it is included
+# in the SDK.
+FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"
 
 BBCLASSEXTEND = "native nativesdk"
 

Comments

Khem Raj March 21, 2020, 9:57 p.m.
On 3/20/20 10:26 PM, Tom Hochstein wrote:
> The FILES variable was customized to package wayland-scanner
> in the -dev package. However, this is only correct for the
> target package and causes wayland-scanner to be missing from
> the SDK.
> 
> Fix the nativesdk packaging by properly limiting the
> wayland-scanner -dev packaging to the target.
> 

Perhaps it should be packaged into a separate package like
wayland-tools or somesuch. It does not belong to -dev package

Then perhaps nativesdk-packagegroup-sdk-host.bb should be adjusted to 
include nativesdk-wayland-tools as well.

> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
>   meta/recipes-graphics/wayland/wayland_1.18.0.bb | 6 ++++--
>   1 file changed, 4 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..4d110a6e1f 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> @@ -54,8 +54,10 @@ 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"
> +# Place wayland-scanner in the -dev package for the target.
> +# Leave it in the main package for native so it is included
> +# in the SDK.
> +FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland"
>   
>   BBCLASSEXTEND = "native nativesdk"
>   
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#136585): https://lists.openembedded.org/g/openembedded-core/message/136585
Mute This Topic: https://lists.openembedded.org/mt/72439819/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie March 21, 2020, 10:42 p.m.
On Sat, 2020-03-21 at 14:57 -0700, Khem Raj wrote:
> 
> On 3/20/20 10:26 PM, Tom Hochstein wrote:
> > The FILES variable was customized to package wayland-scanner
> > in the -dev package. However, this is only correct for the
> > target package and causes wayland-scanner to be missing from
> > the SDK.
> > 
> > Fix the nativesdk packaging by properly limiting the
> > wayland-scanner -dev packaging to the target.
> > 
> 
> Perhaps it should be packaged into a separate package like
> wayland-tools or somesuch. It does not belong to -dev package
> 
> Then perhaps nativesdk-packagegroup-sdk-host.bb should be adjusted
> to include nativesdk-wayland-tools as well.

I have to admit I much prefer this to the current approach...

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#136586): https://lists.openembedded.org/g/openembedded-core/message/136586
Mute This Topic: https://lists.openembedded.org/mt/72439819/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-