Skip to contentSkip to conversation

bitbake.conf: Fix nativesdk-wayland missing from SDK

PATCH Superseded Tom Hochstein 2 participants 3 messages Mar 19, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 2/2 wayland: Fix wayland-scanner missing from SDK

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.

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

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

Quoted 18 lines · 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.

---
 meta/recipes-graphics/wayland/wayland_1.18.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/wayland_1.18.0.bb +0 -0
index 00be3aac27..c7098483bc 100644

meta/recipes-graphics/wayland/wayland_1.18.0.bb sysroot_stage_all_append_class-target () { · line 58

Quoted 7 lines
meta/recipes-graphics/wayland/wayland_1.18.0.bb +2 -2
@@ -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