dbus-glib: package the binding tool into PN-tools, enable nativesdk

In a SDK environment we need a nativesdk build of dbus-glib for the
dbus-binding-tool binary.  Add a nativesdk variation and put the tool into
a -tools subpackage so it can be installed if needed.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/dbus/dbus-glib_0.114.bb b/meta/recipes-core/dbus/dbus-glib_0.114.bb
index 28a9d4a4fc773a65e34be7f98d48621ee1504163..ff3d282ac6f506e0d22ce1adfd2aba4d961ff7b9 100644 (file)
--- a/meta/recipes-core/dbus/dbus-glib_0.114.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.114.bb
@@ -29,16 +29,19 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[tests] = "--enable-tests,,,"
 
 EXTRA_OECONF:class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
+EXTRA_OECONF:class-nativesdk = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
 
-PACKAGES += "${PN}-tests"
+PACKAGES += "${PN}-tests ${PN}-tools"
 
 FILES:${PN} = "${libdir}/lib*${SOLIBS}"
 FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper"
 LICENSE:${PN}-bash-completion = "GPL-2.0-or-later"
-FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-FILES:${PN}-dev += "${bindir}/dbus-binding-tool"
+
+RDEPENDS:${PN}-dev += "${PN}-tools"
 
 RDEPENDS:${PN}-tests = "${PN}"
 FILES:${PN}-tests = "${datadir}/${BPN}/tests"
 
-BBCLASSEXTEND = "native"
+FILES:${PN}-tools = "${bindir}"
+
+BBCLASSEXTEND = "native nativesdk"