Skip to contentSkip to conversation

bitbake.conf: Add wayland to DISTRO_FEATURES_FILTER_NATIVESDK

PATCH New Tom Hochstein 1 participant 2 messages Feb 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bitbake.conf: Add wayland to DISTRO_FEATURES_FILTER_NATIVESDK

nativesdk-wayland was not being added to the SDK. This fixes that.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 2da7c5849a..a93099bf0c 100644
@@ -826,7 +826,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.17.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/wayland_1.17.0.bb +2 -2
index 12916a0c40..cb4ff2c20b 100644
@@ -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"
Signature · 1 line
2.17.1