Skip to contentSkip to conversation

bitbake.conf: Fix nativesdk-wayland missing from SDK

PATCH In review Tom Hochstein 3 participants 4 messages Mar 21, 2020

lore
Share & tools
lore
#0 lore raw

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

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.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 4b544a22cd..e44de34a00 100644
@@ -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"
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/2 wayland: Fix wayland-scanner missing from SDK

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.

---
 meta/recipes-graphics/wayland/wayland_1.18.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/wayland_1.18.0.bb +4 -2
index 00be3aac27..4d110a6e1f 100644
@@ -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"
 
Signature · 1 line
2.17.1
#2 lore raw

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

Quoted 8 lines · Tom Hochstein

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.

Quoted 23 lines
---
  meta/recipes-graphics/wayland/wayland_1.18.0.bb | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/wayland_1.18.0.bb +4 -2
index 00be3aac27..4d110a6e1f 100644
@@ -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"
 
#3 lore raw

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

Quoted 11 lines · Khem Raj
Quoted 8 lines · Tom Hochstein

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.

Quoted 5 lines

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