[meta-oe][PATCH] dbus-broker: package ptest files from nonarch_libdir

From: Khem Raj <[email protected]>

dbus-broker's meson build installs its test and benchmark binaries to a
hardcoded path derived from the prefix:

    conf.set('testdir', get_option('prefix') / 'lib/dbus-broker/tests')

i.e. always ${prefix}/lib/dbus-broker/tests, regardless of ${baselib}.
In OE terms that is ${nonarch_libdir}, not ${libdir}.

The recipe however collects them with ${libdir}, which only matches on
targets where baselib is "lib". On lib64 targets and for multilib
variants (e.g. lib32-dbus-broker) ${libdir} differs from the hardcoded
install path, so the installed tests are not captured by any package and
do_package fails with:

    QA Issue: dbus-broker: Files/directories were installed but not
    shipped in any package:
      /usr/lib/dbus-broker/tests/unit/test-...
      /usr/lib/dbus-broker/tests/dbus/test-...
    [installed-vs-shipped]

Use ${nonarch_libdir} so the FILES glob always matches meson's install
location.

Signed-off-by: Khem Raj <[email protected]>
---
 meta-oe/recipes-core/dbus/dbus-broker_37.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/dbus/dbus-broker_37.bb b/meta-oe/recipes-core/dbus/dbus-broker_37.bb
index ae9c8f2fcd..8691afb90b 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_37.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_37.bb
@@ -40,7 +40,7 @@ RDEPENDS:${PN} += "dbus-common dbus-tools"
 FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
 FILES:${PN} += "${systemd_system_unitdir}"
 FILES:${PN} += "${systemd_user_unitdir}"
-FILES:${PN}-ptest += "${libdir}/${PN}/tests"
+FILES:${PN}-ptest += "${nonarch_libdir}/${PN}/tests"

 # test-sockopt fails to compile with musl without this flag
 CFLAGS:append:libc-musl = "${@bb.utils.contains('PTEST_ENABLED', '1', ' -Wno-error=incompatible-pointer-types ', '', d)}"