diff options
| -rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.10.20.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus_1.10.20.bb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.10.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.20.bb index eeadb7d35b7..d50bbc8fd61 100644 --- a/meta/recipes-core/dbus/dbus-test_1.10.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.20.bb @@ -54,5 +54,8 @@ do_install_ptest() { for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test; done install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test cp -r ${B}/test/data ${D}${PTEST_PATH}/test + + # fix host contamination + find ${D} -type f -not -executable -exec sed -i 's:${B}:${PTEST_PATH}:' {} \; } RDEPENDS_${PN}-ptest += "bash" diff --git a/meta/recipes-core/dbus/dbus_1.10.20.bb b/meta/recipes-core/dbus/dbus_1.10.20.bb index 9ddedc15fe8..010fc519469 100644 --- a/meta/recipes-core/dbus/dbus_1.10.20.bb +++ b/meta/recipes-core/dbus/dbus_1.10.20.bb @@ -91,8 +91,7 @@ pkg_postinst_dbus() { fi } -EXTRA_OECONF = "--disable-tests \ - --disable-xml-docs \ +EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ --enable-largefile \ @@ -101,10 +100,11 @@ EXTRA_OECONF = "--disable-tests \ EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" EXTRA_OECONF_append_class-native = " --disable-selinux" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ptest systemd x11', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG[ptest] = "--enable-embedded-tests --enable-asserts --enable-verbose-mode,--disable-embedded-tests --disable-asserts --disable-verbose-mode" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" |